Fix for PR libgcj/4481:

	* java/io/File.java (getParent): Handle case where path is "/".
	(normalizePath): Use correct string for UNC leader.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46093 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index b79cb49..af67c16 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-08  Tom Tromey  <tromey@redhat.com>
+
+       Fix for PR libgcj/4481:
+       * java/io/File.java (getParent): Handle case where path is "/".
+       (normalizePath): Use correct string for UNC leader.
+
 2001-10-06  Mark Wielaard  <mark@klomp.org>
 
        * java/io/BufferedInputStream.java: Merge with Classpath

diff --git a/libjava/java/io/File.java b/libjava/java/io/File.java
index 858f2b3..a268278 100644 (file)
--- a/libjava/java/io/File.java
+++ b/libjava/java/io/File.java
@@ -84,9 +84,9 @@ public class File implements Serializable, Comparable
   {
     int dupIndex = p.indexOf(dupSeparator);
     int plen = p.length();
-    
+
     // Special case: permit Windows UNC path prefix.
-    if (dupSeparator.equals("\\") && dupIndex == 0)
+    if (dupSeparator.equals("\\\\") && dupIndex == 0)
       dupIndex = p.indexOf(dupSeparator, 1);
 
     if (dupIndex == -1)
@@ -181,6 +181,9 @@ public class File implements Serializable, Comparable
     int last = path.lastIndexOf(separatorChar);
     if (last == -1)
       return null;
+    // FIXME: POSIX assumption.
+    if (last == 0 && path.charAt (0) == '/')
+      ++last;
     return path.substring(0, last);
   }