* support-test-*.cs: Rename from test-*-p2.cs.

[mono.git] / mcs / class / corlib / System.IO / DirectoryInfo.cs

diff --git a/mcs/class/corlib/System.IO/DirectoryInfo.cs b/mcs/class/corlib/System.IO/DirectoryInfo.cs
index d431318541315744cac17faea56be8265bb6015f..b8372743871c76db932c9d8dcd6193040edb293c 100644 (file)
--- a/mcs/class/corlib/System.IO/DirectoryInfo.cs
+++ b/mcs/class/corlib/System.IO/DirectoryInfo.cs
@@ -60,12 +60,15 @@ namespace System.IO {
                        if ((len > 1) && (FullPath [len] == Path.DirectorySeparatorChar))
                                len--;
                        int last = FullPath.LastIndexOf (Path.DirectorySeparatorChar, len);
-                       if (last == -1) {
+                       if ((last == -1) || ((last == 0) && (len == 0))) {
                                current = FullPath;
                                parent = null;
                        } else {
                                current = FullPath.Substring (last + 1, len - last);
-                               parent = FullPath.Substring (0, last);
+                               if (last == 0 && !Environment.IsRunningOnWindows)
+                                       parent = Path.DirectorySeparatorStr;
+                               else
+                                       parent = FullPath.Substring (0, last);
                                // adjust for drives, i.e. a special case for windows
                                if (Environment.IsRunningOnWindows) {
                                        if ((parent.Length == 2) && (parent [1] == ':') && Char.IsLetter (parent [0]))