aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam King <aking@dreammechanics.com>2002-04-17 23:02:33 +0000
committerBryce McKinlay <bryce@gcc.gnu.org>2002-04-18 00:02:33 +0100
commitb7403f10f2892ac2f2f4f09f9635d41043f728d9 (patch)
treea46b09c7c072767f0e4e9badcd7d7074f40828e5
parent63501e9115d6fc0183adc9ed97efdf83ee47c724 (diff)
downloadgcc-b7403f10f2892ac2f2f4f09f9635d41043f728d9.zip
gcc-b7403f10f2892ac2f2f4f09f9635d41043f728d9.tar.gz
gcc-b7403f10f2892ac2f2f4f09f9635d41043f728d9.tar.bz2
File.java (normalizePath): Add Win32 support for auto conversion of a '/' path separator to Win32's '\'...
* java/io/File.java (normalizePath): Add Win32 support for auto conversion of a '/' path separator to Win32's '\' separator. From-SVN: r52447
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/java/io/File.java5
2 files changed, 10 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 6fd80b1..6fd948b 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-17 Adam King <aking@dreammechanics.com>
+
+ * java/io/File.java (normalizePath): Add Win32 support for auto
+ conversion of a '/' path separator to Win32's '\' separator.
+
2002-04-16 Tom Tromey <tromey@redhat.com>
Fix for PR libgcj/6081:
diff --git a/libjava/java/io/File.java b/libjava/java/io/File.java
index a268278..2086f10 100644
--- a/libjava/java/io/File.java
+++ b/libjava/java/io/File.java
@@ -82,6 +82,11 @@ public class File implements Serializable, Comparable
// Remove duplicate and redundant separator characters.
private String normalizePath(String p)
{
+ // On Windows, convert any '/' to '\'. This appears to be the same logic
+ // that Sun's Win32 Java performs.
+ if (separatorChar == '\\')
+ p = p.replace ('/', '\\');
+
int dupIndex = p.indexOf(dupSeparator);
int plen = p.length();