From 077919a1fdeab4974f960959e50af35f842a4059 Mon Sep 17 00:00:00 2001 From: tromey Date: Mon, 8 Oct 2001 20:42:13 +0000 Subject: 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 --- libjava/java/io/File.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'libjava/java') diff --git a/libjava/java/io/File.java b/libjava/java/io/File.java index 858f2b37cae..a268278fd3e 100644 --- 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); } -- cgit v1.2.3