summaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorAdam King <aking@dreammechanics.com>2002-04-17 23:01:09 +0000
committerBryce McKinlay <bryce@gcc.gnu.org>2002-04-18 00:01:09 +0100
commitceba9d086a98a054f9e389c1ad059bcc182f4918 (patch)
treeacffb4bfe2a43325af90aaa733513f3b69fc623f /libjava
parente9368e842ad0866455ba662984d4a0c4c8165719 (diff)
downloadgcc-ceba9d086a98a054f9e389c1ad059bcc182f4918.tar.gz
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: r52446
Diffstat (limited to 'libjava')
-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 845f07c9d5f..6f758e58dec 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 DJ Delorie <dj@redhat.com>
* configure.in: Allow building in $srcdir.
diff --git a/libjava/java/io/File.java b/libjava/java/io/File.java
index a268278fd3e..2086f1057aa 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();