natSystem.cc (init_properties): Revert yesterday's changes to "file.separator"...

	* java/lang/natSystem.cc (init_properties): Revert yesterday's changes
	to "file.separator", "path.separator", and "java.io.tmpdir" property
	initialization.
	* java/io/File.java: Likewise.
	* java/io/natFile.cc (init_native): Likewise.
	* java/io/natFileWin32.cc (init_native): Likewise.

From-SVN: r40994

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 177052ffc736f7536bff5a7a9b6ce53aaabc37bc..55618ff51bead1cb04df1de537bc559d513d63c9 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,12 @@
+2001-04-02  Bryce McKinlay  <bryce@albatross.co.nz>
+
+       * java/lang/natSystem.cc (init_properties): Revert yesterday's changes
+       to "file.separator", "path.separator", and "java.io.tmpdir" property
+       initialization.
+       * java/io/File.java: Likewise.
+       * java/io/natFile.cc (init_native): Likewise.
+       * java/io/natFileWin32.cc (init_native): Likewise.
+
 2001-04-01  Per Bothner  <per@bothner.com>
 
        * java/lang/natString.cc (intern):  If string's data does not point to

diff --git a/libjava/java/io/File.java b/libjava/java/io/File.java
index 8d987120161f203990bf1bb5f6c2b0424a26b654..71da25565554034aa5cf22c70db48116bb5ed51d 100644 (file)
--- a/libjava/java/io/File.java
+++ b/libjava/java/io/File.java
@@ -195,11 +195,6 @@ public class File implements Serializable, Comparable
                                             FileFilter fileFilter,
                                             Class result_type);
 
-  // Arguments for the performList function. Specifies whether we want
-  // File objects or path strings in the returned object array.
-  private final static int OBJECTS = 0;
-  private final static int STRINGS = 1;
-
   public String[] list (FilenameFilter filter)
   {
     checkRead();
@@ -435,25 +430,23 @@ public class File implements Serializable, Comparable
     return performSetLastModified(time);
   }
 
-  public static final String separator = null;
-  public static final String pathSeparator = null;
-  static final String tmpdir = null;
+  public static final String pathSeparator
+    = System.getProperty("path.separator");
+  public static final char pathSeparatorChar = pathSeparator.charAt(0);
+  public static final String separator = System.getProperty("file.separator");
+  public static final char separatorChar = separator.charAt(0);
+
+  static final String tmpdir = System.getProperty("java.io.tmpdir");
   static int maxPathLen;
   static boolean caseSensitive;
   
-  public static final char separatorChar;
-  public static final char pathSeparatorChar;
-  
   static
   {
     init_native();
-    pathSeparatorChar = pathSeparator.charAt(0);
-    separatorChar = separator.charAt(0);
   }
   
   // Native function called at class initialization. This should should
-  // set the separator, pathSeparator, tmpdir, maxPathLen, and caseSensitive
-  // variables.
+  // set the maxPathLen and caseSensitive variables.
   private static native void init_native();
 
   // The path.

diff --git a/libjava/java/io/natFile.cc b/libjava/java/io/natFile.cc
index e0f27b9dccec62fe10bd666ea861f448ab7d883a..89cdec6ebeb48d22dc5218b8564c3aba6830da24 100644 (file)
--- a/libjava/java/io/natFile.cc
+++ b/libjava/java/io/natFile.cc
@@ -338,13 +338,6 @@ java::io::File::performDelete (void)
 void
 java::io::File::init_native ()
 {
-  separator = JvNewStringLatin1 ("/");
-  pathSeparator = JvNewStringLatin1 (":");
-  
-  char *tmp = ::getenv("TMPDIR");
-  if (! tmp)
-    tmp = "/tmp";
-  tmpdir = JvNewStringLatin1 (tmp);
   maxPathLen = MAXPATHLEN;
   caseSensitive = true;
 }

diff --git a/libjava/java/io/natFileWin32.cc b/libjava/java/io/natFileWin32.cc
index 2f0b8afcc75313097e610da90ff31af9d47303f5..eb1dc191ca8693e51ec1b70d78b000190d927639 100644 (file)
--- a/libjava/java/io/natFileWin32.cc
+++ b/libjava/java/io/natFileWin32.cc
@@ -248,9 +248,6 @@ java::io::File::performDelete ()
 void
 java::io::File::init_native ()
 {
-  separator = JvNewStringLatin1 ("\\");
-  pathSeparator = JvNewStringLatin1 (";");
-  tmpdir = JvNewStringLatin1 ("C:\\temp"); // FIXME?
   maxPathLen = MAX_PATH;
   caseSensitive = false;
 }

diff --git a/libjava/java/lang/natSystem.cc b/libjava/java/lang/natSystem.cc
index ee1d9988ca704a823fd6089b9ad00a97c9685a3a..abf62caae8a2770561d976e71018abfb7b871fb3 100644 (file)
--- a/libjava/java/lang/natSystem.cc
+++ b/libjava/java/lang/natSystem.cc
@@ -55,7 +55,6 @@ details.  */
 #include <java/lang/StringBuffer.h>
 #include <java/util/Properties.h>
 #include <java/util/TimeZone.h>
-#include <java/io/File.h>
 #include <java/io/PrintStream.h>
 #include <java/io/InputStream.h>
 
@@ -324,19 +323,20 @@ java::lang::System::init_properties (void)
   
   SET ("file.encoding", default_file_encoding);
 
-  JvInitClass (&java::io::File::class$);  
-  newprops->put (JvNewStringLatin1 ("file.separator"), 
-                java::io::File::separator);
-  newprops->put (JvNewStringLatin1 ("path.separator"),
-                java::io::File::pathSeparator);
-  newprops->put (JvNewStringLatin1 ("java.io.tmpdir"), 
-                java::io::File::tmpdir);
-
 #ifdef WIN32
+  SET ("file.separator", "\\");
+  SET ("path.separator", ";");
   SET ("line.separator", "\r\n");
+  SET ("java.io.tmpdir", "C:\\temp");
 #else
   // Unix.
+  SET ("file.separator", "/");
+  SET ("path.separator", ":");
   SET ("line.separator", "\n");
+  char *tmpdir = ::getenv("TMPDIR");
+  if (! tmpdir)
+    tmpdir = "/tmp";
+  SET ("java.io.tmpdir", tmpdir);
 #endif
 
 #ifdef HAVE_UNAME