diff options
| author | Bryce McKinlay <bryce@albatross.co.nz> | 2001-04-02 05:23:10 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2001-04-02 06:23:10 +0100 |
| commit | 8f58baf480016ba3a3a60b57218104acf05a49bf (patch) | |
| tree | d42597c75d702a648db5a0edd2bb5836d74ce443 /libjava/java/lang/natSystem.cc | |
| parent | a3406c06c269f8960be29474b19bb1bcb2ac6775 (diff) | |
| download | gcc-8f58baf480016ba3a3a60b57218104acf05a49bf.zip gcc-8f58baf480016ba3a3a60b57218104acf05a49bf.tar.gz gcc-8f58baf480016ba3a3a60b57218104acf05a49bf.tar.bz2 | |
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
Diffstat (limited to 'libjava/java/lang/natSystem.cc')
| -rw-r--r-- | libjava/java/lang/natSystem.cc | 18 |
1 files changed, 9 insertions, 9 deletions
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 |