diff options
| author | Adam King <aking@dreammechanics.com> | 2002-04-07 11:27:00 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2002-04-07 12:27:00 +0100 |
| commit | 455cd615c2dde26432ae38a5529a73789df52106 (patch) | |
| tree | 069e876f78e2a8d34d5f4bb0c46db26f878a30bc /libjava/java/lang/natSystem.cc | |
| parent | 1abbe5b516d49d696910b03440f65c5819f8d755 (diff) | |
| download | gcc-455cd615c2dde26432ae38a5529a73789df52106.zip gcc-455cd615c2dde26432ae38a5529a73789df52106.tar.gz gcc-455cd615c2dde26432ae38a5529a73789df52106.tar.bz2 | |
natSystem.cc (init_properties): Call new function _Jv_platform_initProperties.
2002-04-07 Adam King <aking@dreammechanics.com>
* java/lang/natSystem.cc (init_properties): Call new function
_Jv_platform_initProperties.
* win32 (_Jv_platform_initProperties): New function that adds Win32
support for the System properties os.name, os.arch, os.version,
user.name, user.home, and user.dir.
* include/posix.h, include/win32.h, posix.cc: New function
_Jv_platform_initProperties.
From-SVN: r51989
Diffstat (limited to 'libjava/java/lang/natSystem.cc')
| -rw-r--r-- | libjava/java/lang/natSystem.cc | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/libjava/java/lang/natSystem.cc b/libjava/java/lang/natSystem.cc index 958e78c..b8467f2 100644 --- a/libjava/java/lang/natSystem.cc +++ b/libjava/java/lang/natSystem.cc @@ -333,22 +333,6 @@ java::lang::System::init_properties (void) SET ("file.encoding", default_file_encoding); -#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 struct utsname u; if (! uname (&u)) @@ -515,6 +499,10 @@ java::lang::System::init_properties (void) newprops->put(JvNewStringLatin1 ("java.class.path"), sb->toString ()); } + + // Allow platform specific settings and overrides. + _Jv_platform_initProperties (newprops); + // Finally, set the field. This ensures that concurrent getProperty() // calls will return initialized values without requiring them to be // synchronized in the common case. |