natSystem.cc (init_properties): set java.lang.classpath property.

        * java/lang/natSystem.cc (init_properties): set java.lang.classpath
        property.

From-SVN: r31981

diff --git a/libjava/java/lang/natSystem.cc b/libjava/java/lang/natSystem.cc
index 35093df927ed2aad153f42fe2682a0f57f555a8b..78ea75c84ab7da455dda6c366f51cabfafa9bf3e 100644 (file)
--- 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 ();