From 0d0060c0a1b40e5924efa48a9b815b6a6f93c8cb Mon Sep 17 00:00:00 2001 From: bryce Date: Sun, 7 Apr 2002 11:27:00 +0000 Subject: [PATCH] 2002-04-07 Adam King * 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@51989 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 10 ++++ libjava/include/posix.h | 2 + libjava/include/win32.h | 2 + libjava/java/lang/natSystem.cc | 20 ++----- libjava/posix.cc | 19 ++++++ libjava/win32.cc | 130 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 167 insertions(+), 16 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index d3fd6822728..e29b4d295e1 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,13 @@ +2002-04-07 Adam King + + * 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. + 2002-04-06 Mark Wielaard * java/lang/Character,java (isDefined): getType() != UNASSIGNED. diff --git a/libjava/include/posix.h b/libjava/include/posix.h index 7e9aaf54d92..8fa782fc662 100644 --- a/libjava/include/posix.h +++ b/libjava/include/posix.h @@ -34,10 +34,12 @@ details. */ #include #include +#include extern int _Jv_select (int n, fd_set *, fd_set *, fd_set *, struct timeval *); extern jlong _Jv_platform_gettimeofday (); extern void _Jv_platform_initialize (void); +extern void _Jv_platform_initProperties (java::util::Properties*); inline void _Jv_platform_close_on_exec (jint fd) diff --git a/libjava/include/win32.h b/libjava/include/win32.h index 9d8bdfb6066..9a8a7690914 100644 --- a/libjava/include/win32.h +++ b/libjava/include/win32.h @@ -17,8 +17,10 @@ details. */ #undef __INSIDE_CYGWIN__ #include #include +#include extern void _Jv_platform_initialize (void); +extern void _Jv_platform_initProperties (java::util::Properties*); extern jlong _Jv_platform_gettimeofday (); inline void diff --git a/libjava/java/lang/natSystem.cc b/libjava/java/lang/natSystem.cc index 958e78cb54b..b8467f2077b 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. diff --git a/libjava/posix.cc b/libjava/posix.cc index 6b0ea8cad3c..ebff1c9ec79 100644 --- a/libjava/posix.cc +++ b/libjava/posix.cc @@ -12,12 +12,14 @@ details. */ #include "posix.h" +#include #include #include #include #include #include +#include #if defined (ECOS) extern "C" unsigned long long _clock (void); @@ -62,6 +64,23 @@ _Jv_platform_initialize (void) #endif } +// Set platform-specific System properties. +void +_Jv_platform_initProperties (java::util::Properties* newprops) +{ + // A convenience define. +#define SET(Prop,Val) \ + newprops->put(JvNewStringLatin1 (Prop), JvNewStringLatin1 (Val)) + + SET ("file.separator", "/"); + SET ("path.separator", ":"); + SET ("line.separator", "\n"); + char *tmpdir = ::getenv("TMPDIR"); + if (! tmpdir) + tmpdir = "/tmp"; + SET ("java.io.tmpdir", tmpdir); +} + static inline void internal_gettimeofday (struct timeval *result) { diff --git a/libjava/win32.cc b/libjava/win32.cc index 57c63789f36..78f57b348dd 100644 --- a/libjava/win32.cc +++ b/libjava/win32.cc @@ -11,9 +11,11 @@ details. */ #include #include #include +#include #include "platform.h" #include +#include static LONG CALLBACK win32_exception_handler (LPEXCEPTION_POINTERS e) @@ -62,3 +64,131 @@ __mingwthr_key_dtor (DWORD, void (*) (void *)) // approximately 24 bytes per thread created. return 0; } + +// Set platform-specific System properties. +void +_Jv_platform_initProperties (java::util::Properties* newprops) +{ + // A convenience define. +#define SET(Prop,Val) \ + newprops->put(JvNewStringLatin1 (Prop), JvNewStringLatin1 (Val)) + + SET ("file.separator", "\\"); + SET ("path.separator", ";"); + SET ("line.separator", "\r\n"); + SET ("java.io.tmpdir", "C:\\temp"); + + // Use GetCurrentDirectory to set 'user.dir'. + DWORD buflen = MAX_PATH; + char* buffer = (char *) malloc (buflen); + if (buffer != NULL) + { + if (GetCurrentDirectory (buflen, buffer)) + SET ("user.dir", buffer); + free (buffer); + } + + // Use GetUserName to set 'user.name'. + buflen = 257; // UNLEN + 1 + buffer = (char *) malloc (buflen); + if (buffer != NULL) + { + if (GetUserName (buffer, &buflen)) + SET ("user.name", buffer); + free (buffer); + } + + // According to the api documentation for 'GetWindowsDirectory()', the + // environmental variable HOMEPATH always specifies the user's home + // directory or a default directory. On the 3 windows machines I checked + // only 1 had it set. If it's not set, JDK1.3.1 seems to set it to + // the windows directory, so we'll do the same. + char* userHome = NULL; + if ((userHome = ::getenv( "HOMEPATH" )) == NULL ) + { + // Check HOME since it's what I use. + if ((userHome = ::getenv( "HOME" )) == NULL ) + { + // Not found - use the windows directory like JDK1.3.1 does. + char* winHome = (char *)malloc (MAX_PATH); + if ( winHome != NULL ) + { + if (GetWindowsDirectory (winHome, MAX_PATH)) + SET ("user.home", winHome); + free (winHome); + } + } + } + if( userHome != NULL ) + SET ("user.home", userHome); + + // Get and set some OS info. + OSVERSIONINFO osvi; + ZeroMemory (&osvi, sizeof(OSVERSIONINFO)); + osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + if (GetVersionEx (&osvi)) + { + char *buffer = (char *) malloc (30); + if (buffer != NULL) + { + sprintf (buffer, "%d.%d", (int)osvi.dwMajorVersion, (int)osvi.dwMinorVersion); + SET ("os.version", buffer); + free (buffer); + } + + switch (osvi.dwPlatformId) + { + case VER_PLATFORM_WIN32_WINDOWS: + if (osvi.dwMajorVersion == 4 && osvi.dwMinorVersion == 0) + SET ("os.name", "Windows 95"); + else if (osvi.dwMajorVersion == 4 && osvi.dwMinorVersion == 10) + SET ("os.name", "Windows 98"); + else if (osvi.dwMajorVersion == 4 && osvi.dwMinorVersion == 90) + SET ("os.name", "Windows Me"); + else + SET ("os.name", "Windows ??"); + break; + + case VER_PLATFORM_WIN32_NT: + if (osvi.dwMajorVersion <= 4 ) + SET ("os.name", "Windows NT"); + else if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0) + SET ("os.name", "Windows 2000"); + else if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1) + SET ("os.name", "Windows XP"); + else + SET ("os.name", "Windows NT ??"); + break; + + default: + SET ("os.name", "Windows UNKNOWN"); + break; + } + } + + // Set the OS architecture. + SYSTEM_INFO si; + GetSystemInfo (&si); + switch( si.dwProcessorType ) + { + case PROCESSOR_INTEL_386: + SET ("os.arch", "i386"); + break; + case PROCESSOR_INTEL_486: + SET ("os.arch", "i486"); + break; + case PROCESSOR_INTEL_PENTIUM: + SET ("os.arch", "i586"); + break; + case PROCESSOR_MIPS_R4000: + SET ("os.arch", "MIPS4000"); + break; + case PROCESSOR_ALPHA_21064: + SET ("os.arch", "ALPHA"); + break; + default: + SET ("os.arch", "unknown"); + break; + } +} + -- 2.11.0