2004-08-30 Jeroen Frijters <jeroen@frijters.net>

	* java/io/File.java File(String,String): Fixed handling of empty
	path.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@86774 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 29 insertions, 6 deletions

diff --git a/libjava/java/io/File.java b/libjava/java/io/File.java
index 1d930d59b84..2626d47e9e1 100644
--- a/libjava/java/io/File.java
+++ b/libjava/java/io/File.java
@@ -361,14 +361,37 @@ public class File implements Serializable, Comparable
   {
     if (name == null)
       throw new NullPointerException();
-    if (dirPath != null && dirPath.length() > 0)
+    if (dirPath != null)
       {
-	// Try to be smart about the number of separator characters.
-	if (dirPath.charAt(dirPath.length() - 1) == separatorChar
-	    || name.length() == 0)
-	  path = normalizePath(dirPath + name);
+	if (dirPath.length() > 0)
+	  {
+	    // Try to be smart about the number of separator characters.
+	    if (dirPath.charAt(dirPath.length() - 1) == separatorChar
+		|| name.length() == 0)
+	      path = normalizePath(dirPath + name);
+	    else
+	      path = normalizePath(dirPath + separatorChar + name);
+	  }
 	else
-	  path = normalizePath(dirPath + separatorChar + name);
+	  {
+	    // If dirPath is empty, use a system dependant
+	    // default prefix.
+	    // Note that the leading separators in name have
+	    // to be chopped off, to prevent them forming
+	    // a UNC prefix on Windows.
+	    if (separatorChar == '\\' /* TODO use ON_WINDOWS */)
+	      {
+		int skip = 0;
+		while(name.length() > skip
+		    && (name.charAt(skip) == separatorChar
+		    || name.charAt(skip) == '/'))
+		  {
+		    skip++;
+		  }
+		name = name.substring(skip);
+	      }
+	    path = normalizePath(separatorChar + name);
+	  }
       }
     else
       path = normalizePath(name);