diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-10-08 20:42:13 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-10-08 20:42:13 +0000 |
| commit | 077919a1fdeab4974f960959e50af35f842a4059 (patch) | |
| tree | a1b91374701e0e8c840428cf94cc685c9a767e94 /libjava | |
| parent | 133b67177808af03ca9a72061ed7c97e1f0fd56a (diff) | |
| download | gcc-077919a1fdeab4974f960959e50af35f842a4059.tar.gz | |
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
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/java/io/File.java | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index b79cb493608..af67c16b8a4 100644 --- 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 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); } |