2008-04-03 Dick Porter <dick@ximian.com>

	* io-portability.c (_wapi_basename, _wapi_dirname): Only turn \
	into / when MONO_IOMAP is in effect.  Fixes bug 346123.

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

diff --git a/mono/io-layer/ChangeLog b/mono/io-layer/ChangeLog
index fdbb9c27e4a82f0ed4715005d7d902a380d52e25..734df51a34ccf6450c274fb5b25bee1c44fb0731 100644 (file)
--- a/mono/io-layer/ChangeLog
+++ b/mono/io-layer/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-03  Dick Porter  <dick@ximian.com>
+
+       * io-portability.c (_wapi_basename, _wapi_dirname): Only turn \
+       into / when MONO_IOMAP is in effect.  Fixes bug 346123.
+
 2008-04-03  Dick Porter  <dick@ximian.com>
 
        * timefuncs.c (GetTickCount): Use mono_msec_ticks(), see bug

diff --git a/mono/io-layer/io-portability.c b/mono/io-layer/io-portability.c
index fbfff02febfea0f468169cdb37f539c2efa54902..d2fb723230dedc8352e6805b5297fb6a1ea6b089 100644 (file)
--- a/mono/io-layer/io-portability.c
+++ b/mono/io-layer/io-portability.c
@@ -302,7 +302,9 @@ gchar *_wapi_basename (const gchar *filename)
 {
        gchar *new_filename = g_strdup (filename), *ret;
 
-       g_strdelimit (new_filename, "\\", '/');
+       if (IS_PORTABILITY_SET) {
+               g_strdelimit (new_filename, "\\", '/');
+       }
 
        if (IS_PORTABILITY_DRIVE &&
            g_ascii_isalpha (new_filename[0]) &&
@@ -323,7 +325,9 @@ gchar *_wapi_dirname (const gchar *filename)
 {
        gchar *new_filename = g_strdup (filename), *ret;
 
-       g_strdelimit (new_filename, "\\", '/');
+       if (IS_PORTABILITY_SET) {
+               g_strdelimit (new_filename, "\\", '/');
+       }
 
        if (IS_PORTABILITY_DRIVE &&
            g_ascii_isalpha (new_filename[0]) &&