2004-01-05 Atsushi Enomoto <atsushi@ximian.com>

	* file-io.c : On Windows, there are much more invalid_path_chars.

svn path=/trunk/mono/; revision=21713

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index daf5ab52799caef1cbe805aa5ec794463098903b..d85016f78fcfbf946efe59b9f01acf9343c44bc8 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,6 @@
+2004-01-05  Atsushi Enomoto <atsushi@ximian.com>
+
+       * file-io.c : On Windows, there are much more invalid_path_chars.
 
 Fri Jan 2 13:35:48 CET 2004 Paolo Molaro <lupus@ximian.com>
 

diff --git a/mono/metadata/file-io.c b/mono/metadata/file-io.c
index 1cb647d6abf6ce70dece183072caa06d40c18bb8..3847409fcd8bb741d46223265387345bf1f0cd20 100644 (file)
--- a/mono/metadata/file-io.c
+++ b/mono/metadata/file-io.c
@@ -809,10 +809,20 @@ ves_icall_System_IO_MonoIO_get_PathSeparator ()
 
 static gunichar2 invalid_path_chars [] = {
 #if defined (PLATFORM_WIN32)
-       0x0022,                         /* double quote */
+       0x0022,                         /* double quote, which seems allowed in MS.NET but should be rejected */
        0x003c,                         /* less than */
        0x003e,                         /* greater than */
        0x007c,                         /* pipe */
+       0x0008,
+       0x0010,
+       0x0011,
+       0x0012,
+       0x0014,
+       0x0015,
+       0x0016,
+       0x0017,
+       0x0018,
+       0x0019,
 #endif
        0x0000                          /* null */
 };
@@ -827,7 +837,7 @@ ves_icall_System_IO_MonoIO_get_InvalidPathChars ()
        MONO_ARCH_SAVE_REGS;
 
        domain = mono_domain_get ();
-       chars = mono_array_new (domain, mono_defaults.char_class, 5);
+       chars = mono_array_new (domain, mono_defaults.char_class, 15);
 
        n = sizeof (invalid_path_chars) / sizeof (gunichar2);