procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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
This commit is contained in:
Bryce McKinlay 2001-04-02 05:23:10 +00:00 • committed by Bryce McKinlay
parent a3406c06c2
commit 8f58baf480
5 changed files with 26 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

18
libjava/java/lang/natSystem.cc
View file

@ -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