From b7403f10f2892ac2f2f4f09f9635d41043f728d9 Mon Sep 17 00:00:00 2001 From: Adam King Date: Wed, 17 Apr 2002 23:02:33 +0000 Subject: [PATCH] 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 --- libjava/ChangeLog | 5 +++++ libjava/java/io/File.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 6fd80b11106..6fd948b3ef0 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2002-04-17 Adam King + + * java/io/File.java (normalizePath): Add Win32 support for auto + conversion of a '/' path separator to Win32's '\' separator. + 2002-04-16 Tom Tromey Fix for PR libgcj/6081: 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();