diff options
| author | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-04-02 05:23:10 +0000 |
|---|---|---|
| committer | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-04-02 05:23:10 +0000 |
| commit | bb152f3590f6d484b8bc86718cf73cde463abbef (patch) | |
| tree | d42597c75d702a648db5a0edd2bb5836d74ce443 /libjava/java/lang | |
| parent | 1cb80700a4d11992e5a8f92e86c2f519b801819f (diff) | |
| download | ppe42-gcc-bb152f3590f6d484b8bc86718cf73cde463abbef.tar.gz ppe42-gcc-bb152f3590f6d484b8bc86718cf73cde463abbef.zip | |
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@40994 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/lang')
| -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 ee1d9988ca7..abf62caae8a 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 |
