# 
# patch "ChangeLog"
#  from [e3312f9e4eda04bb1e456a9da9d6a907a7789f80]
#    to [6ba3031fda8d6a2f0ecc613a0a3b3dfcdf705b58]
# 
# patch "paths.cc"
#  from [5b889bd7969d862fb8a7063236ddbfbcb6c71ff2]
#    to [4e328a9f3d45bd0635e60699e1c085f4359ca1b8]
# 
========================================================================
--- ChangeLog	e3312f9e4eda04bb1e456a9da9d6a907a7789f80
+++ ChangeLog	6ba3031fda8d6a2f0ecc613a0a3b3dfcdf705b58
@@ -1,5 +1,12 @@
 2005-08-25  Nathaniel Smith  <address@hidden>
 
+	* paths.cc (file_path): Fix up error reporting in external path
+	normalization.
+	(test_file_path_external_no_prefix): "" is always an invalid
+	path.
+
+2005-08-25  Nathaniel Smith  <address@hidden>
+
 	* database.cc (sql): Only check schema version when db actually
 	exists.
 
========================================================================
--- paths.cc	5b889bd7969d862fb8a7063236ddbfbcb6c71ff2
+++ paths.cc	4e328a9f3d45bd0635e60699e1c085f4359ca1b8
@@ -169,10 +169,11 @@
         {
           N(false, F("path '%s' is invalid") % path);
         }
-      N(!relative.has_root_path(), F("absolute path '%s' is invalid"));
+      data = utf8(out.string());
+      N(!relative.has_root_path(),
+        F("absolute path '%s' is invalid") % relative.string());
       N(fully_normalized_path(data()), F("path '%s' is invalid") % data);
       N(!in_bookkeeping_dir(data()), F("path '%s' is in bookkeeping dir") % data);
-      data = utf8(out.string());
     }
   I(fully_normalized_path(data()));
   I(!in_bookkeeping_dir(data()));
@@ -567,11 +568,11 @@
                             "c:\\foo",
                             "c:foo",
                             "c:/foo",
+                            "",
                             0 };
   for (char const ** c = baddies; *c; ++c)
     BOOST_CHECK_THROW(file_path_external(utf8(*c)), informative_failure);
   
-  check_fp_normalizes_to("", "");
   check_fp_normalizes_to("a", "a");
   check_fp_normalizes_to("foo", "foo");
   check_fp_normalizes_to("foo/bar", "foo/bar");