New test.
[mono.git] / mcs / class / corlib / System.IO / Path.cs
index c4cf2dcfb88c9bda3b7386bf4b1cbfef59c85308..44b391d69985552c95395ea8cebc03344c95fa18 100644 (file)
 // System.IO.Path.cs 
 //
 // Copyright (C) 2001 Moonlight Enterprises, All Rights Reserved
+// Copyright (C) 2002 Ximian, Inc. (http://www.ximian.com)
+// Copyright (C) 2003 Ben Maurer
 // 
 // Author:         Jim Richardson, develop@wtfo-guru.com
+//                 Dan Lewis (dihlewis@yahoo.co.uk)
+//                 Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//                 Ben Maurer (bmaurer@users.sourceforge.net)
+//                 Sebastien Pouliot  <sebastien@ximian.com>
 // Created:        Saturday, August 11, 2001 
 //
 //------------------------------------------------------------------------------
 
-using System;
+//
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System.Globalization;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Security;
+using System.Security.Cryptography;
+using System.Security.Permissions;
+using System.Text;
+
+namespace System.IO {
+
+#if NET_2_0
+       [ComVisible (true)]
+       public static class Path {
 
-namespace System.IO
-{
-       public class Path : Object
-       {
-               public static readonly char AltDirectorySeparatorChar = PlatformSpecific.AltDirectorySeparatorChar;
-               public static readonly char DirectorySeparatorChar = PlatformSpecific.DirectorySeparatorChar;
-               public static readonly char[] InvalidPathChars = PlatformSpecific.InvalidPathChars;
-               public static readonly char PathSeparator = PlatformSpecific.PathSeparator;
-               public static readonly char VolumeSeparatorChar = PlatformSpecific.VolumeSeparatorChar;
+               [Obsolete ("see GetInvalidPathChars and GetInvalidFileNameChars methods.")]
+               public static readonly char[] InvalidPathChars;
+#else
+       public sealed class Path {
 
-               private static readonly char[] PathSeparatorChars = {   DirectorySeparatorChar, 
-                                                                                                                               AltDirectorySeparatorChar,
-                                                                                                                               VolumeSeparatorChar };
+               private Path ()
+               {
+               }
+
+               public static readonly char[] InvalidPathChars;
+#endif
+               public static readonly char AltDirectorySeparatorChar;
+               public static readonly char DirectorySeparatorChar;
+               public static readonly char PathSeparator;
+               internal static readonly string DirectorySeparatorStr;
+               public static readonly char VolumeSeparatorChar;
+
+               private static readonly char[] PathSeparatorChars;
+               private static readonly bool dirEqualsVolume;
 
                // class methods
-               public static string ChangeExtension(string path, string extension)
+               public static string ChangeExtension (string path, string extension)
                {
-                       if(path == null)
-                       {
+                       if (path == null)
                                return null;
-                       }
 
-                       int iExt = findExtension(path);
+                       if (path.IndexOfAny (InvalidPathChars) != -1)
+                               throw new ArgumentException ("Illegal characters in path", "path");
+
+                       int iExt = findExtension (path);
+
+                       if (extension == null)
+                               return iExt < 0 ? path : path.Substring (0, iExt);
+                       else if (extension == String.Empty)
+                               return iExt < 0 ? path + '.' : path.Substring (0, iExt + 1);
+
+                       else if (path.Length != 0) {
+                               if (extension.Length > 0 && extension [0] != '.')
+                                       extension = "." + extension;
+                       } else
+                               extension = String.Empty;
                        
-                       if(iExt < 0)
-                       {
-                               return extension == null ? path : path + extension;
-                       }
-                       else if(iExt > 0)
-                       {
-                               string temp = path.Substring(0, iExt);
-                               if(extension != null)
-                               {
-                                       return temp + extension;
-                               }
-                               return  temp;
+                       if (iExt < 0) {
+                               return path + extension;
+                       } else if (iExt > 0) {
+                               string temp = path.Substring (0, iExt);
+                               return temp + extension;
                        }
 
                        return extension;
                }
 
-               public static string Combine(string path1, string path2)
+               public static string Combine (string path1, string path2)
                {
-                       if(path1 == null || path2 == null)
-                       {
-                               return null;
-                       }
+                       if (path1 == null)
+                               throw new ArgumentNullException ("path1");
 
-                       throwEmptyIf(path2);
+                       if (path2 == null)
+                               throw new ArgumentNullException ("path2");
 
-                       // TODO: Check for invalid DirectoryInfo characters
-                       //       although I don't think it is necesary for linux
+                       if (path1 == String.Empty)
+                               return path2;
 
-                       // TODO: Verify functionality further after NUnit tests written
-                       //               since the documentation was rather sketchy
+                       if (path2 == String.Empty)
+                               return path1;
 
-                       if(IsPathRooted(path2))
-                       {
-                               if(path1.Equals(string.Empty))
-                               {
-                                       return path2;
-                               }
-                               throw new ArgumentException("Rooted path");
-                       }
-                       
-                       string dirSep = new string(DirectorySeparatorChar, 1);
-                       string altSep = new string(AltDirectorySeparatorChar, 1);
-                       
-                       bool b1 = path1.EndsWith(dirSep) || path1.EndsWith(dirSep);
-                       bool b2 = path2.StartsWith(dirSep) || path2.StartsWith(altSep);
-                       if(b1 && b2)
-                       {
-                               throw new ArgumentException("Invalid combination");
-                       }
+                       if (path1.IndexOfAny (InvalidPathChars) != -1)
+                               throw new ArgumentException ("Illegal characters in path", "path1");
+
+                       if (path2.IndexOfAny (InvalidPathChars) != -1)
+                               throw new ArgumentException ("Illegal characters in path", "path2");
+
+                       //TODO???: UNC names
+                       // LAMESPEC: MS says that if path1 is not empty and path2 is a full path
+                       // it should throw ArgumentException
+                       if (IsPathRooted (path2))
+                               return path2;
                        
-                       if(!b1 && !b2)
-                       {
-                               return path1 + dirSep + path2;
-                       }
+                       char p1end = path1 [path1.Length - 1];
+                       if (p1end != DirectorySeparatorChar && p1end != AltDirectorySeparatorChar && p1end != VolumeSeparatorChar)
+                               return path1 + DirectorySeparatorChar + path2;
 
                        return path1 + path2;
                }
 
-               public static string GetDirectoryName(string path)
+               public static string GetDirectoryName (string path)
                {
-                       if(path == null)
-                       {
+                       // LAMESPEC: For empty string MS docs say both
+                       // return null AND throw exception.  Seems .NET throws.
+                       if (path == String.Empty)
+                               throw new ArgumentException();
+
+                       if (path == null || GetPathRoot (path) == path)
                                return null;
-                       }
-                       throwEmptyIf(path);
-                       throwWhiteSpaceOnlyIf(path);
-                       throwInvalidPathCharsIf(path);
 
-                       if(path.Length > 2)
-                       {
-                               int nLast = path.LastIndexOfAny(PathSeparatorChars, path.Length - 2);
+                       CheckArgument.WhitespaceOnly (path);
+                       CheckArgument.PathChars (path);
 
-                               if(nLast > 0)
-                               {
-                                       return path.Substring(0, nLast);
-                               }
+                       int nLast = path.LastIndexOfAny (PathSeparatorChars);
+                       if (nLast == 0)
+                               nLast++;
+
+                       if (nLast > 0) {
+                               string ret = path.Substring (0, nLast);
+                               int l = ret.Length;
+                               if (l >= 2 && ret [l - 1] == VolumeSeparatorChar)
+                                       return ret + DirectorySeparatorChar;
+                               else
+                                       return ret;
                        }
-                       return path;
+
+                       return String.Empty;
                }
 
-               public static string GetExtension(string path)
+               public static string GetExtension (string path)
                {
-                       if(path == null)
-                       {
-                               return string.Empty;
-                       }
+                       if (path == null)
+                               return null;
 
-                       throwEmptyIf(path);
-                       throwWhiteSpaceOnlyIf(path);
-                       
-                       int iExt = findExtension(path);
-                       int iLastSep = path.LastIndexOfAny( PathSeparatorChars );
+                       if (path.IndexOfAny (InvalidPathChars) != -1)
+                               throw new ArgumentException ("Illegal characters in path", "path");
+
+                       int iExt = findExtension (path);
 
-                       if(iExt > -1)
-                       {       // okay it has an extension
-                               return path.Substring(iExt);
+                       if (iExt > -1)
+                       {
+                               if (iExt < path.Length - 1)
+                                       return path.Substring (iExt);
                        }
                        return string.Empty;
                }
 
-               public static string GetFileName(string path)
+               public static string GetFileName (string path)
                {
-                       if(path == null)
-                       {
-                               return string.Empty;
-                       }
+                       if (path == null || path == String.Empty)
+                               return path;
 
-                       throwEmptyIf(path);
-                       throwWhiteSpaceOnlyIf(path);
+                       if (path.IndexOfAny (InvalidPathChars) != -1)
+                               throw new ArgumentException ("Illegal characters in path", "path");
 
-                       int nLast = path.LastIndexOfAny(PathSeparatorChars);
+                       int nLast = path.LastIndexOfAny (PathSeparatorChars);
+                       if (nLast >= 0)
+                               return path.Substring (nLast + 1);
 
-                       if(nLast > 0)
-                       {
-                               return path.Substring(nLast + 1);
-                       }
+                       return path;
+               }
 
-                       return nLast == 0 ? null : path;
+               public static string GetFileNameWithoutExtension (string path)
+               {
+                       return ChangeExtension (GetFileName (path), null);
                }
 
-               public static string GetFileNameWithoutExtension(string path)
+               public static string GetFullPath (string path)
                {
-                       return ChangeExtension(GetFileName(path), null);
+                       string fullpath = InsecureGetFullPath (path);
+                       if (SecurityManager.SecurityEnabled) {
+                               new FileIOPermission (FileIOPermissionAccess.PathDiscovery, fullpath).Demand ();
+                       }
+                       return fullpath;
                }
 
-               public static string GetFullPath(string path)
+               internal static string WindowsDriveAdjustment (string path)
                {
-                       if(path != null)
-                       {
-                               //TODO: Implement this correctly
+                       // two special cases to consider when a drive is specified
+                       if (path.Length < 2)
+                               return path;
+                       if ((path [1] != ':') || !Char.IsLetter (path [0]))
                                return path;
+
+                       string current = Directory.GetCurrentDirectory ();
+                       // first, only the drive is specified
+                       if (path.Length == 2) {
+                               // then if the current directory is on the same drive
+                               if (current [0] == path [0])
+                                       path = current; // we return it
+                               else
+                                       path += '\\';
+                       } else if ((path [2] != Path.DirectorySeparatorChar) && (path [2] != Path.AltDirectorySeparatorChar)) {
+                               // second, the drive + a directory is specified *without* a separator between them (e.g. C:dir).
+                               // If the current directory is on the specified drive...
+                               if (current [0] == path [0]) {
+                                       // then specified directory is appended to the current drive directory
+                                       path = Path.Combine (current, path.Substring (2, path.Length - 2));
+                               } else {
+                                       // if not, then just pretend there was a separator (Path.Combine won't work in this case)
+                                       path = String.Concat (path.Substring (0, 2), DirectorySeparatorStr, path.Substring (2, path.Length - 2));
+                               }
                        }
-                       return null;
+                       return path;
                }
 
-               public static string GetPathRoot(string path)
+               // insecure - do not call directly
+               internal static string InsecureGetFullPath (string path)
                {
-                       if(path != null || 
-                               (path.StartsWith(new string(DirectorySeparatorChar, 1)) ||
-                                       path.StartsWith(new string(AltDirectorySeparatorChar, 1))))
-                       {
-                               return path.Substring(0, 1);
+                       if (path == null)
+                               throw new ArgumentNullException ("path");
+
+                       if (path.Trim ().Length == 0) {
+                               string msg = Locale.GetText ("The specified path is not of a legal form (empty).");
+                               throw new ArgumentException (msg, "path");
+                       }
+
+                       // adjust for drives, i.e. a special case for windows
+                       if (Environment.IsRunningOnWindows)
+                               path = WindowsDriveAdjustment (path);
+
+                       // if the supplied path ends with a separator...
+                       char end = path [path.Length - 1];
+
+                       if (path.Length >= 2 &&
+                               IsDsc (path [0]) &&
+                               IsDsc (path [1])) {
+                               if (path.Length == 2 || path.IndexOf (path [0], 2) < 0)
+                                       throw new ArgumentException ("UNC pass should be of the form \\\\server\\share.");
+
+                               if (path [0] != DirectorySeparatorChar)
+                                       path = path.Replace (AltDirectorySeparatorChar, DirectorySeparatorChar);
+                       } else {
+                               if (!IsPathRooted (path))
+                                       path = Directory.GetCurrentDirectory () + DirectorySeparatorStr + path;
+                               else if (DirectorySeparatorChar == '\\' &&
+                                       path.Length >= 2 &&
+                                       IsDsc (path [0]) &&
+                                       !IsDsc (path [1])) { // like `\abc\def'
+                                       string current = Directory.GetCurrentDirectory ();
+                                       if (current [1] == VolumeSeparatorChar)
+                                               path = current.Substring (0, 2) + path;
+                                       else
+                                               path = current.Substring (0, current.IndexOf ('\\', current.IndexOf ("\\\\") + 1));
+                               }
+                               path = CanonicalizePath (path);
                        }
-                       return null;
+
+                       // if the original ended with a [Alt]DirectorySeparatorChar then ensure the full path also ends with one
+                       if (IsDsc (end) && (path [path.Length - 1] != DirectorySeparatorChar))
+                               path += DirectorySeparatorChar;
+
+                       return path;
                }
 
-               public static string GetTempFileName()
+               static bool IsDsc (char c) {
+                       return c == DirectorySeparatorChar || c == AltDirectorySeparatorChar;
+               }
+               
+               public static string GetPathRoot (string path)
                {
-                       //TODO: Implement method
-                       return string.Empty;
+                       if (path == null)
+                               return null;
+
+                       if (path == String.Empty)
+                               throw new ArgumentException ("This specified path is invalid.");
+
+                       if (!IsPathRooted (path))
+                               return String.Empty;
+                       
+                       if (DirectorySeparatorChar == '/') {
+                               // UNIX
+                               return IsDsc (path [0]) ? DirectorySeparatorStr : String.Empty;
+                       } else {
+                               // Windows
+                               int len = 2;
+
+                               if (path.Length == 1 && IsDsc (path [0]))
+                                       return DirectorySeparatorStr;
+                               else if (path.Length < 2)
+                                       return String.Empty;
+
+                               if (IsDsc (path [0]) && IsDsc (path[1])) {
+                                       // UNC: \\server or \\server\share
+                                       // Get server
+                                       while (len < path.Length && !IsDsc (path [len])) len++;
+
+                                       // Get share
+                                       if (len < path.Length) {
+                                               len++;
+                                               while (len < path.Length && !IsDsc (path [len])) len++;
+                                       }
+
+                                       return DirectorySeparatorStr +
+                                               DirectorySeparatorStr +
+                                               path.Substring (2, len - 2).Replace (AltDirectorySeparatorChar, DirectorySeparatorChar);
+                               } else if (IsDsc (path [0])) {
+                                       // path starts with '\' or '/'
+                                       return DirectorySeparatorStr;
+                               } else if (path[1] == VolumeSeparatorChar) {
+                                       // C:\folder
+                                       if (path.Length >= 3 && (IsDsc (path [2]))) len++;
+                               } else
+                                       return Directory.GetCurrentDirectory ().Substring (0, 2);// + path.Substring (0, len);
+                               return path.Substring (0, len);
+                       }
                }
 
-               /// <summary>
-               /// Returns the path of the current systems temp directory
-               /// </summary>
-               public static string GetTempPath()
-               {       // TODO: This might vary with distribution and there
-                       //       might be an api to provide it. Research is needed
-                       return "/tmp";
+               // FIXME: Further limit the assertion when imperative Assert is implemented
+               [FileIOPermission (SecurityAction.Assert, Unrestricted = true)]
+               public static string GetTempFileName ()
+               {
+                       FileStream f = null;
+                       string path;
+                       Random rnd;
+                       int num = 0;
+
+                       rnd = new Random ();
+                       do {
+                               num = rnd.Next ();
+                               num++;
+                               path = Path.Combine (GetTempPath(), "tmp" + num.ToString("x") + ".tmp");
+
+                               try {
+                                       f = new FileStream (path, FileMode.CreateNew);
+                               }
+                               catch (SecurityException) {
+                                       // avoid an endless loop
+                                       throw;
+                               }
+                               catch {
+                               }
+                       } while (f == null);
+                       
+                       f.Close();
+                       return path;
                }
 
-               public static bool HasExtension(string path)
+               [EnvironmentPermission (SecurityAction.Demand, Unrestricted = true)]
+               public static string GetTempPath ()
+               {
+                       string p = get_temp_path ();
+                       if (p.Length > 0 && p [p.Length - 1] != DirectorySeparatorChar)
+                               return p + DirectorySeparatorChar;
+
+                       return p;
+               }
+
+               [MethodImplAttribute(MethodImplOptions.InternalCall)]
+               private static extern string get_temp_path ();
+
+               public static bool HasExtension (string path)
                {  
-                       throwNullIf(path);
-                       throwEmptyIf(path);
-                       throwWhiteSpaceOnlyIf(path);
-                       
-                       return findExtension(path) > -1;
+                       if (path == null || path.Trim () == String.Empty)
+                               return false;
+
+                       int pos = findExtension (path);
+                       return 0 <= pos && pos < path.Length - 1;
+               }
+
+               public static bool IsPathRooted (string path)
+               {
+                       if (path == null || path.Length == 0)
+                               return false;
+
+                       if (path.IndexOfAny (InvalidPathChars) != -1)
+                               throw new ArgumentException ("Illegal characters in path", "path");
+
+                       char c = path [0];
+                       return (c == DirectorySeparatorChar     ||
+                               c == AltDirectorySeparatorChar  ||
+                               (!dirEqualsVolume && path.Length > 1 && path [1] == VolumeSeparatorChar));
+               }
+
+#if NET_2_0
+               public static char[] GetInvalidFileNameChars ()
+               {
+                       // return a new array as we do not want anyone to be able to change the values
+                       if (Environment.IsRunningOnWindows) {
+                               return new char [41] { '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
+                                       '\x08', '\x09', '\x0A', '\x0B', '\x0C', '\x0D', '\x0E', '\x0F', '\x10', '\x11', '\x12', 
+                                       '\x13', '\x14', '\x15', '\x16', '\x17', '\x18', '\x19', '\x1A', '\x1B', '\x1C', '\x1D', 
+                                       '\x1E', '\x1F', '\x22', '\x3C', '\x3E', '\x7C', ':', '*', '?', '\\', '/' };
+                       } else {
+                               return new char [2] { '\x00', '/' };
+                       }
                }
 
-               public static bool IsPathRooted(string path)
+               public static char[] GetInvalidPathChars ()
                {
-                       return path.StartsWith(new string(VolumeSeparatorChar,1));
+                       // return a new array as we do not want anyone to be able to change the values
+                       if (Environment.IsRunningOnWindows) {
+                               return new char [36] { '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
+                                       '\x08', '\x09', '\x0A', '\x0B', '\x0C', '\x0D', '\x0E', '\x0F', '\x10', '\x11', '\x12', 
+                                       '\x13', '\x14', '\x15', '\x16', '\x17', '\x18', '\x19', '\x1A', '\x1B', '\x1C', '\x1D', 
+                                       '\x1E', '\x1F', '\x22', '\x3C', '\x3E', '\x7C' };
+                       } else {
+                               return new char [1] { '\x00' };
+                       }
                }
 
+               public static string GetRandomFileName ()
+               {
+                       char[] invalid = GetInvalidFileNameChars ();
+                       // returns a 8.3 filename (total size 12)
+                       StringBuilder sb = new StringBuilder (12);
+                       // using strong crypto but without creating the file
+                       RandomNumberGenerator rng = RandomNumberGenerator.Create ();
+                       byte[] buffer = new byte [16];
+                       while (sb.Length < 12) {
+                               int i = 0;
+                               rng.GetNonZeroBytes (buffer);
+                               while ((i < buffer.Length) && (sb.Length < 12)) {
+                                       char c = (char) buffer [i];
+                                       if (Array.IndexOf (invalid, c) == -1)
+                                               sb.Append (c);
+                                       i++;
+                                       if (sb.Length == 8)
+                                               sb.Append ('.');
+                               }
+                       }
+                       return sb.ToString ();
+               }
+#endif
                // private class methods
 
-               private static int findExtension(string path)
-               {       // method should return the index of the path extension
+               private static int findExtension (string path)
+               {
+                       // method should return the index of the path extension
                        // start or -1 if no valid extension
-                       if(path != null)
-                       {               
-                               int iLastDot = path.LastIndexOf(".");
-                               int iLastSep = path.LastIndexOfAny( PathSeparatorChars );
+                       if (path != null){
+                               int iLastDot = path.LastIndexOf ('.');
+                               int iLastSep = path.LastIndexOfAny ( PathSeparatorChars );
 
-                               if(iLastDot > iLastSep)
-                               {
+                               if (iLastDot > iLastSep)
                                        return iLastDot;
-                               }
                        }
                        return -1;
                }
 
-               private static void throwNullIf(string path)
+               static Path ()
                {
-                       if(path == null)
-                       {
-                               throw new ArgumentNullException();
+                       VolumeSeparatorChar = MonoIO.VolumeSeparatorChar;
+                       DirectorySeparatorChar = MonoIO.DirectorySeparatorChar;
+                       AltDirectorySeparatorChar = MonoIO.AltDirectorySeparatorChar;
+
+                       PathSeparator = MonoIO.PathSeparator;
+#if NET_2_0
+                       // this copy will be modifiable ("by design")
+                       InvalidPathChars = GetInvalidPathChars ();
+#else
+                       if (Environment.IsRunningOnWindows) {
+                               InvalidPathChars = new char [15] { '\x00', '\x08', '\x10', '\x11', '\x12', '\x14', '\x15', '\x16',
+                                       '\x17', '\x18', '\x19', '\x22', '\x3C', '\x3E', '\x7C' };
+                       } else {
+                               InvalidPathChars = new char [1] { '\x00' };
                        }
-               }
+#endif
+                       // internal fields
 
-               private static void throwEmptyIf(string path)
+                       DirectorySeparatorStr = DirectorySeparatorChar.ToString ();
+                       PathSeparatorChars = new char [] {
+                               DirectorySeparatorChar,
+                               AltDirectorySeparatorChar,
+                               VolumeSeparatorChar
+                       };
+
+                       dirEqualsVolume = (DirectorySeparatorChar == VolumeSeparatorChar);
+               }
+               
+               static bool SameRoot (string root, string path)
                {
-                       if(path != null && path.Length == 0)
-                       {
-                               throw new ArgumentException("Empty string");
+                       // compare root - if enough details are available
+                       if ((root.Length < 2) || (path.Length < 2))
+                               return false;
+                       // same volume/drive
+                       if (!root [0].Equals (path [0]))
+                               return false;
+                       // presence if the separator
+                       if (path[1] != Path.VolumeSeparatorChar)
+                               return false;
+                       if ((root.Length > 2) && (path.Length > 2)) {
+                               // but don't directory compare the directory separator
+                               return (IsDsc (root[2]) && IsDsc (path[2]));
                        }
+                       return true;
                }
 
-               private static void throwWhiteSpaceOnlyIf(string path)
+               static string CanonicalizePath (string path)
                {
-                       if(path != null)
-                       {
-                               string temp = path;
-                               temp.Trim();
-                               if(temp.Length == 0)
-                               {
-                                       throw new ArgumentException("Whitespace only string");
+                       // STEP 1: Check for empty string
+                       if (path == null)
+                               return path;
+                       if (Environment.IsRunningOnWindows)
+                               path = path.Trim ();
+
+                       if (path.Length == 0)
+                               return path;
+
+                       // STEP 2: Check to see if this is only a root
+                       string root = Path.GetPathRoot (path);
+                       // it will return '\' for path '\', while it should return 'c:\' or so.
+                       // Note: commenting this out makes the ened for the (target == 1...) check in step 5
+                       //if (root == path) return path;
+
+                       // STEP 3: split the directories, this gets rid of consecutative "/"'s
+                       string[] dirs = path.Split (Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
+                       // STEP 4: Get rid of directories containing . and ..
+                       int target = 0;
+
+                       for (int i = 0; i < dirs.Length; i++) {
+                               if (dirs[i] == "." || (i != 0 && dirs[i].Length == 0))
+                                       continue;
+                               else if (dirs[i] == "..") {
+                                       if (target != 0)
+                                               target--;
+                               } else
+                                       dirs[target++] = dirs[i];
+                       }
+
+                       // STEP 5: Combine everything.
+                       if (target == 0 || (target == 1 && dirs[0] == ""))
+                               return root;
+                       else {
+                               string ret = String.Join (DirectorySeparatorStr, dirs, 0, target);
+                               if (Environment.IsRunningOnWindows) {
+                                       if (!SameRoot (root, ret))
+                                               ret = root + ret;
+                                       // In GetFullPath(), it is assured that here never comes UNC. So this must only applied to such path that starts with '\', without drive specification.
+                                       if (!IsDsc (path[0]) && SameRoot (root, path)) {
+                                               if (ret.Length <= 2 && !ret.EndsWith (DirectorySeparatorStr)) // '\' after "c:"
+                                                       ret += Path.DirectorySeparatorChar;
+                                               return ret;
+                                       } else {
+                                               string current = Directory.GetCurrentDirectory ();
+                                               if (current.Length > 1 && current[1] == Path.VolumeSeparatorChar) {
+                                                       // DOS local file path
+                                                       if (ret.Length == 0 || IsDsc (ret[0]))
+                                                               ret += '\\';
+                                                       return current.Substring (0, 2) + ret;
+                                               } else if (IsDsc (current[current.Length - 1]) && IsDsc (ret[0]))
+                                                       return current + ret.Substring (1);
+                                               else
+                                                       return current + ret;
+                                       }
                                }
+                               return ret;
                        }
                }
-               
-               private static void throwInvalidPathCharsIf(string path)
+
+               // required for FileIOPermission (and most proibably reusable elsewhere too)
+               // both path MUST be "full paths"
+               static internal bool IsPathSubsetOf (string subset, string path)
                {
-                       if(path != null && path.IndexOfAny(InvalidPathChars) > -1)
-                       {
-                               throw new ArgumentException("Invalid path characters");
+                       if (subset.Length > path.Length)
+                               return false;
+
+                       // check that everything up to the last separator match
+                       int slast = subset.LastIndexOfAny (PathSeparatorChars);
+                       if (String.Compare (subset, 0, path, 0, slast) != 0)
+                               return false;
+
+                       slast++;
+                       // then check if the last segment is identical
+                       int plast = path.IndexOfAny (PathSeparatorChars, slast);
+                       if (plast >= slast) {
+                               return String.Compare (subset, slast, path, slast, path.Length - plast) == 0;
                        }
+                       if (subset.Length != path.Length)
+                               return false;
+
+                       return String.Compare (subset, slast, path, slast, subset.Length - slast) == 0;
                }
        }
 }