2003-02-01 Miguel de Icaza <miguel@ximian.com>

	* Uri.cs (LocalPath): Local path should return un-escaped
	strings.  Patch from tum@veridicus.com (Thong (Tum) Nguyen)

svn path=/trunk/mcs/; revision=11773

diff --git a/mcs/class/System/System/ChangeLog b/mcs/class/System/System/ChangeLog
index 208a463d433df0422072c31cfb6200c7b992588f..a9bdd2e24b03f299f812d560e1f2ea45d82ec8a8 100644 (file)
--- a/mcs/class/System/System/ChangeLog
+++ b/mcs/class/System/System/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-01  Miguel de Icaza  <miguel@ximian.com>
+
+       * Uri.cs (LocalPath): Local path should return un-escaped
+       strings.  Patch from tum@veridicus.com (Thong (Tum) Nguyen)
+
 2002-09-16  Duncan Mak  <duncan@ximian.com>
 
        * Uri.cs (GetObjectData):

diff --git a/mcs/class/System/System/Uri.cs b/mcs/class/System/System/Uri.cs
index 219f865a398e24abf4f4aa66feb755997b76af5a..9859f9b529706e03883b3826478e2995585210af 100755 (executable)
--- a/mcs/class/System/System/Uri.cs
+++ b/mcs/class/System/System/Uri.cs
@@ -289,12 +289,12 @@ namespace System
                                
                                // support *nix and W32 styles
                                if (path.Length > 1 && path [1] == ':')
-                                       return path.Replace ('/', '\\');
+                                       return Unescape (path.Replace ('/', '\\'));
                                        
                                if (System.IO.Path.DirectorySeparatorChar == '\\')
-                                       return "\\\\" + host + path.Replace ('/', '\\');
+                                       return "\\\\" + Unescape (host + path.Replace ('/', '\\'));
                                else 
-                                       return "/" + host + path;
+                                       return "/" + Unescape (host + path);
                        } 
                }