Author: lupus
Date: 2005-04-20 09:38:21 -0400 (Wed, 20 Apr 2005)
New Revision: 43327
Modified:
trunk/mono/mono/metadata/ChangeLog
trunk/mono/mono/metadata/file-io.c
Log:
Wed Apr 20 16:09:06 CEST 2005 Paolo Molaro <[EMAIL PROTECTED]>
* file-io.c: fix alt dir separator char on unix systems
and cleanup (fixes bug #71214).
Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog 2005-04-20 13:25:56 UTC (rev 43326)
+++ trunk/mono/mono/metadata/ChangeLog 2005-04-20 13:38:21 UTC (rev 43327)
@@ -1,3 +1,9 @@
+
+Wed Apr 20 16:09:06 CEST 2005 Paolo Molaro <[EMAIL PROTECTED]>
+
+ * file-io.c: fix alt dir separator char on unix systems
+ and cleanup (fixes bug #71214).
+
2005-04-19 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* marshal.c: Use CALLVIRT instead of CALL when dispatching
Modified: trunk/mono/mono/metadata/file-io.c
===================================================================
--- trunk/mono/mono/metadata/file-io.c 2005-04-20 13:25:56 UTC (rev 43326)
+++ trunk/mono/mono/metadata/file-io.c 2005-04-20 13:38:21 UTC (rev 43327)
@@ -791,52 +791,45 @@
gunichar2
ves_icall_System_IO_MonoIO_get_VolumeSeparatorChar ()
{
- MONO_ARCH_SAVE_REGS;
-
#if defined (PLATFORM_WIN32)
- return (gunichar2) 0x003a; /* colon */
+ return (gunichar2) ':'; /* colon */
#else
- return (gunichar2) 0x002f; /* forward slash */
+ return (gunichar2) '/'; /* forward slash */
#endif
}
gunichar2
ves_icall_System_IO_MonoIO_get_DirectorySeparatorChar ()
{
- MONO_ARCH_SAVE_REGS;
-
#if defined (PLATFORM_WIN32)
- return (gunichar2) 0x005c; /* backslash */
+ return (gunichar2) '\\'; /* backslash */
#else
- return (gunichar2) 0x002f; /* forward slash */
+ return (gunichar2) '/'; /* forward slash */
#endif
}
gunichar2
ves_icall_System_IO_MonoIO_get_AltDirectorySeparatorChar ()
{
- MONO_ARCH_SAVE_REGS;
-
#if defined (PLATFORM_WIN32)
- return (gunichar2) 0x002f; /* forward slash */
+ return (gunichar2) '/'; /* forward slash */
#else
- return (gunichar2) 0x005c; /* backslash */
+ return (gunichar2) '/'; /* slash, same as DirectorySeparatorChar */
#endif
}
gunichar2
ves_icall_System_IO_MonoIO_get_PathSeparator ()
{
- MONO_ARCH_SAVE_REGS;
-
#if defined (PLATFORM_WIN32)
- return (gunichar2) 0x003b; /* semicolon */
+ return (gunichar2) ';'; /* semicolon */
#else
- return (gunichar2) 0x003a; /* colon */
+ return (gunichar2) ':'; /* colon */
#endif
}
-static gunichar2 invalid_path_chars [] = {
+static const gunichar2
+invalid_path_chars [] = {
#if defined (PLATFORM_WIN32)
0x0022, /* double quote, which seems allowed in
MS.NET but should be rejected */
0x003c, /* less than */
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
