From: Mohan Embar <gnustuff@thisiscool.com>
Date: Tue, 6 Jul 2004 16:27:26 +0000 (+0000)
Subject: URLStreamHandler.java (parseURL): Canonicalize file portion of URL in addition to... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c09bade66238d64dbe68f1333b854b8659aaa547;p=gcc.git

URLStreamHandler.java (parseURL): Canonicalize file portion of URL in addition to spec for file: protocol.

	* java/net/URLStreamHandler.java (parseURL): Canonicalize
	file portion of URL in addition to spec for file: protocol.

From-SVN: r84157
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 66f3f41a1d7..8299b732c5b 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-06  Mohan Embar  <gnustuff@thisiscool.com>
+
+	* java/net/URLStreamHandler.java (parseURL): Canonicalize
+	file portion of URL in addition to spec for file: protocol.
+
 2004-07-05  Anthony Green  <green@redhat.com>
 	
 	* java/io/File.java (toURI): Merge from Classpath.
diff --git a/libjava/java/net/URLStreamHandler.java b/libjava/java/net/URLStreamHandler.java
index d224ff556e9..5fef7ea909e 100644
--- a/libjava/java/net/URLStreamHandler.java
+++ b/libjava/java/net/URLStreamHandler.java
@@ -1,5 +1,5 @@
 /* URLStreamHandler.java -- Abstract superclass for all protocol handlers
-   Copyright (C) 1998, 1999, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2002, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -131,8 +131,12 @@ public abstract class URLStreamHandler
     String query = null;
     
     // On Windows we need to change \ to / for file URLs
-    if (url.getProtocol().equals("file"))
-      spec = spec.replace(File.separatorChar, '/');
+    char separator = File.separatorChar;
+    if (url.getProtocol().equals("file") && separator != '/')
+      {
+	file = file.replace(separator, '/');
+	spec = spec.replace(separator, '/');
+      }
 
     if (spec.regionMatches(start, "//", 0, 2))
       {
@@ -216,7 +220,7 @@ public abstract class URLStreamHandler
 	      {
 		boolean endsWithSlash = file.charAt(file.length() - 1) == '/';
 		file = new File(file).getCanonicalPath();
-		file = file.replace(File.separatorChar, '/');
+		file = file.replace(separator, '/');
 		if (endsWithSlash && file.charAt(file.length() - 1) != '/')
 		  file += '/';
 	      }