# 
# patch "ChangeLog"
#  from [5da896cc49f3aa004dcd0939472edfe2e4b4e86f]
#    to [61da542845a62d6631e392cf9a923db437c5c672]
# 
# patch "paths.cc"
#  from [eda63bc11692ecdb9ab6bc3298bb2f1693460e8e]
#    to [46f64b248f575b56350b8304fbec2b9fcd913bf2]
# 
========================================================================
--- ChangeLog	5da896cc49f3aa004dcd0939472edfe2e4b4e86f
+++ ChangeLog	61da542845a62d6631e392cf9a923db437c5c672
@@ -1,5 +1,11 @@
 2005-08-26  Nathaniel Smith  <address@hidden>
 
+	* paths.cc (test_file_path_external_prefix_a_b) 
+	(test_file_path_external_no_prefix, test_file_path_internal): Test
+	for validity of more strange characters (,address@hidden).
+
+2005-08-26  Nathaniel Smith  <address@hidden>
+
 	* file_io.cc (ident_existing_file): Remove accidentally-left-in
 	code.  Test 26 now passes.
 	* lua.cc (monotone_includedir_for_lua, load_rcfile): Add
========================================================================
--- paths.cc	eda63bc11692ecdb9ab6bc3298bb2f1693460e8e
+++ paths.cc	46f64b248f575b56350b8304fbec2b9fcd913bf2
@@ -513,6 +513,7 @@
                             "foo/bar.baz",
                             "foo/with-hyphen/bar",
                             "foo/with_underscore/bar",
+                            "foo/with,address@hidden/bar",
                             ".foo/bar",
                             "..foo/bar",
                             "MTfoo/bar",
@@ -600,6 +601,8 @@
   check_fp_normalizes_to("..foo/bar", "..foo/bar");
   check_fp_normalizes_to(".", "");
   check_fp_normalizes_to("foo:bar", "foo:bar");
+  check_fp_normalizes_to("foo/with,address@hidden/bar",
+                         "foo/with,address@hidden/bar");
 
   // Why are these tests with // in them commented out?  because boost::fs
   // sucks and can't normalize them.  FIXME.
@@ -647,6 +650,8 @@
   check_fp_normalizes_to("..foo/bar", "a/b/..foo/bar");
   check_fp_normalizes_to(".", "a/b");
   check_fp_normalizes_to("foo:bar", "a/b/foo:bar");
+  check_fp_normalizes_to("foo/with,address@hidden/bar",
+                         "a/b/foo/with,address@hidden/bar");
   // why are the tests with // in them commented out?  because boost::fs sucks
   // and can't normalize them.  FIXME.
   //check_fp_normalizes_to("foo//bar", "a/b/foo/bar");