# 
# patch "ChangeLog"
#  from [cc4161041cb4085a188729e806c1ee5d905934ae]
#    to [ccd7f5b9344561c97c4943e8624eeb13f63a552c]
# 
# patch "paths.cc"
#  from [ca3c2e0bff67faea75076ba1e12bf2c1abd6d1df]
#    to [5b889bd7969d862fb8a7063236ddbfbcb6c71ff2]
# 
========================================================================
--- ChangeLog	cc4161041cb4085a188729e806c1ee5d905934ae
+++ ChangeLog	ccd7f5b9344561c97c4943e8624eeb13f63a552c
@@ -1,9 +1,14 @@
 2005-08-25  Nathaniel Smith  <address@hidden>
 
-	* paths.cc, unix/fs.cc: Many, many fixes and some new tests too.	
+	* paths.cc: Fix all unit test failures, except for two mysterious
+	boost::too_few_args exceptions.
 	
 2005-08-25  Nathaniel Smith  <address@hidden>
 
+	* paths.cc, unix/fs.cc: Many, many fixes and some new tests too.	
+
+2005-08-25  Nathaniel Smith  <address@hidden>
+
 	* paths.cc (struct access_tracker): Doh, initializer should set
 	'initialized'...
 	(test_file_path_internal): It's valid for a split file
========================================================================
--- paths.cc	ca3c2e0bff67faea75076ba1e12bf2c1abd6d1df
+++ paths.cc	5b889bd7969d862fb8a7063236ddbfbcb6c71ff2
@@ -157,20 +157,22 @@
       data = path;
       break;
     case external:
-      fs::path tmp;
+      N(!path.empty(), F("empty path '%s' is invalid") % path);
+      fs::path out, base, relative;
       try
         {
-          tmp = fs::path(initial_rel_path.get().as_internal());
-          tmp /= fs::path(path);
-          tmp = tmp.normalize();
+          base = fs::path(initial_rel_path.get().as_internal());
+          relative = fs::path(path);
+          out = (base / relative).normalize();
         }
       catch (std::exception & e)
         {
           N(false, F("path '%s' is invalid") % path);
         }
-      data = utf8(tmp.string());
+      N(!relative.has_root_path(), F("absolute path '%s' is invalid"));
       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()));
@@ -672,14 +674,18 @@
   BOOST_CHECK(fp3 == file_path(split3));
 
   pcv split4;
-  BOOST_CHECK_THROW(file_path(split4), std::logic_error);
+  // this comparison tricks the compiler into not completely eliminating this
+  // code as dead...
+  BOOST_CHECK_THROW(file_path(split4) == file_path(), std::logic_error);
   split4.push_back(the_null_component);
-  BOOST_CHECK_NOT_THROW(file_path(split4), std::logic_error);
+  BOOST_CHECK(file_path(split4) == file_path());
   split4.clear();
   split4.push_back(split1[0]);
   split4.push_back(the_null_component);
   split4.push_back(split1[0]);
-  BOOST_CHECK_THROW(file_path(split4), std::logic_error);
+  // this comparison tricks the compiler into not completely eliminating this
+  // code as dead...
+  BOOST_CHECK_THROW(file_path(split4) == file_path(), std::logic_error);
 }
 
 static void check_bk_normalizes_to(char * before, char * after)
@@ -705,6 +711,7 @@
                             "c:foo",
                             "c:/foo",
                             "",
+                            "a:b",
                             0 };
   
   for (char const ** c = baddies; *c; ++c)
@@ -717,7 +724,6 @@
   BOOST_CHECK_THROW(bookkeeping_path(std::string("a")), std::logic_error);
   
   check_bk_normalizes_to("a", "MT/a");
-  check_bk_normalizes_to("a:b", "MT/a:b");
   check_bk_normalizes_to("foo", "MT/foo");
   check_bk_normalizes_to("foo/bar", "MT/foo/bar");
   check_bk_normalizes_to("foo/bar/baz", "MT/foo/bar/baz");