diff options
| -rw-r--r-- | libjava/java/lang/natSystem.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libjava/java/lang/natSystem.cc b/libjava/java/lang/natSystem.cc index 35093df..78ea75c 100644 --- a/libjava/java/lang/natSystem.cc +++ b/libjava/java/lang/natSystem.cc @@ -261,9 +261,9 @@ java::lang::System::init_properties (void) SET ("java.specification.name", "Java(tm) Language Specification"); SET ("java.specification.vendor", "Sun Microsystems Inc."); - // FIXME: how to set these given location-independence? + // FIXME: how to set this given location-independence? // SET ("java.home", "FIXME"); - // SET ("java.class.path", "FIXME"); + SET ("file.encoding", default_file_encoding); #ifdef WIN32 @@ -296,6 +296,13 @@ java::lang::System::init_properties (void) } #endif /* HAVE_UNAME */ + char *classpath = ::getenv("CLASSPATH"); + // FIXME: find libgcj.zip and append its path? + if (classpath != NULL) + SET ("java.class.path", classpath); + else + SET ("java.class.path", "."); + #ifndef NO_GETUID #ifdef HAVE_PWD_H uid_t user_id = getuid (); |