diff options
-rw-r--r-- | libjava/ChangeLog | 9 | ||||
-rw-r--r-- | libjava/java/io/File.java | 23 | ||||
-rw-r--r-- | libjava/java/io/natFile.cc | 7 | ||||
-rw-r--r-- | libjava/java/io/natFileWin32.cc | 3 | ||||
-rw-r--r-- | libjava/java/lang/natSystem.cc | 18 |
5 files changed, 26 insertions, 34 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 177052f..55618ff 100644 --- 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 8d98712..71da255 100644 --- 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 e0f27b9..89cdec6 100644 --- 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 2f0b8af..eb1dc19 100644 --- 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 ee1d998..abf62ca 100644 --- 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 |