diff options
Diffstat (limited to 'libjava/java/lang/natSystem.cc')
| -rw-r--r-- | libjava/java/lang/natSystem.cc | 45 |
1 files changed, 21 insertions, 24 deletions
diff --git a/libjava/java/lang/natSystem.cc b/libjava/java/lang/natSystem.cc index 81f7860..2672895 100644 --- a/libjava/java/lang/natSystem.cc +++ b/libjava/java/lang/natSystem.cc @@ -348,34 +348,31 @@ java::lang::System::init_properties (void) } } - // FIXME: find libgcj.zip and append its path? - char *classpath = ::getenv("CLASSPATH"); - jstring cp = properties->getProperty (JvNewStringLatin1("java.class.path")); - java::lang::StringBuffer *sb = new java::lang::StringBuffer (); - if (_Jv_Jar_Class_Path) + properties->put(JvNewStringLatin1 ("java.class.path"), + JvNewStringLatin1 (_Jv_Jar_Class_Path)); + else { - sb->append (JvNewStringLatin1 (_Jv_Jar_Class_Path)); -#ifdef WIN32 - sb->append ((jchar) ';'); -#else - sb->append ((jchar) ':'); -#endif; - } - if (classpath) - { - sb->append (JvNewStringLatin1 (classpath)); + // FIXME: find libgcj.zip and append its path? + char *classpath = ::getenv("CLASSPATH"); + jstring cp = properties->getProperty (JvNewStringLatin1("java.class.path")); + java::lang::StringBuffer *sb = new java::lang::StringBuffer (); + + if (classpath) + { + sb->append (JvNewStringLatin1 (classpath)); #ifdef WIN32 - sb->append ((jchar) ';'); + sb->append ((jchar) ';'); #else - sb->append ((jchar) ':'); + sb->append ((jchar) ':'); #endif; + } + if (cp != NULL) + sb->append (cp); + else + sb->append ((jchar) '.'); + + properties->put(JvNewStringLatin1 ("java.class.path"), + sb->toString ()); } - if (cp != NULL) - sb->append (cp); - else - sb->append ((jchar) '.'); - - properties->put(JvNewStringLatin1 ("java.class.path"), - sb->toString ()); } |