- removed Java_java_lang_VMRuntime_insertSystemProperties (is now in
authortwisti <none@none>
Wed, 12 Jan 2005 13:25:30 +0000 (13:25 +0000)
committertwisti <none@none>
Wed, 12 Jan 2005 13:25:30 +0000 (13:25 +0000)
  VMSystemProperties.c)
- renamed nativeGetLibname to mapLibraryName

src/native/vm/VMRuntime.c

index 983c1337872b46534ef8286a2ff441a02386e924..c6020b3c93085083a47e58eb7f74fb338366b1f3 100644 (file)
@@ -29,7 +29,7 @@
    Changes: Joseph Wenninger
             Christian Thalinger
 
-   $Id: VMRuntime.c 1863 2005-01-05 20:14:08Z motse $
+   $Id: VMRuntime.c 1869 2005-01-12 13:25:30Z twisti $
 
 */
 
@@ -64,7 +64,6 @@
 #include "vm/exceptions.h"
 #include "vm/loader.h"
 #include "vm/tables.h"
-#include "vm/jit/asmpart.h"
 
 
 /* this should work on BSD */
 /* should we run all finalizers on exit? */
 static bool finalizeOnExit = false;
 
-/* temporary property structure */
-
-typedef struct property property;
-
-struct property {
-       char     *key;
-       char     *value;
-       property *next;
-};
-
-static property *properties = NULL;
-
-
-/* create_property *************************************************************
-
-   Create a property entry for a command line property definition.
-
-*******************************************************************************/
-
-void create_property(char *key, char *value)
-{
-       property *p;
-
-       p = NEW(property);
-       p->key = key;
-       p->value = value;
-       p->next = properties;
-       properties = p;
-}
-
-
-/* insert_property *************************************************************
-
-   Used for inserting a property into the system's properties table. Method m
-   (usually put) and the properties table must be given.
-
-*******************************************************************************/
-
-static void insert_property(methodinfo *m, java_util_Properties *p, char *key,
-                                                       char *value)
-{
-       asm_calljavafunction(m,
-                                                p,
-                                                javastring_new_char(key),
-                                                javastring_new_char(value),
-                                                NULL);
-}
-
 
 /*
- * Class:     java_lang_VMRuntime
+ * Class:     java/lang/VMRuntime
  * Method:    execInternal
  * Signature: ([Ljava/lang/String;[Ljava/lang/String;Ljava/io/File;)Ljava/lang/Process;
  */
@@ -353,10 +304,10 @@ JNIEXPORT s4 JNICALL Java_java_lang_VMRuntime_nativeLoad(JNIEnv *env, jclass cla
 
 /*
  * Class:     java/lang/VMRuntime
- * Method:    nativeGetLibname
- * Signature: (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ * Method:    mapLibraryName
+ * Signature: (Ljava/lang/String;)Ljava/lang/String;
  */
-JNIEXPORT java_lang_String* JNICALL Java_java_lang_VMRuntime_nativeGetLibname(JNIEnv *env, jclass clazz, java_lang_String *pathname, java_lang_String *libname)
+JNIEXPORT java_lang_String* JNICALL Java_java_lang_VMRuntime_mapLibraryName(JNIEnv *env, jclass clazz, java_lang_String *libname)
 {
        char *buffer;
        int buffer_len;
@@ -395,175 +346,6 @@ JNIEXPORT java_lang_String* JNICALL Java_java_lang_VMRuntime_nativeGetLibname(JN
 }
 
 
-/*
- * Class:     java_lang_VMRuntime
- * Method:    insertSystemProperties
- * Signature: (Ljava/util/Properties;)V
- */
-JNIEXPORT void JNICALL Java_java_lang_VMRuntime_insertSystemProperties(JNIEnv *env, jclass clazz, java_util_Properties *p)
-{
-
-#define BUFFERSIZE 200
-       methodinfo *m;
-       char cwd[BUFFERSIZE];
-       char *java_home;
-       char *user;
-       char *home;
-       char *locale;
-       char *lang;
-       char *region;
-
-       struct utsname utsnamebuf;
-#if !defined(STATIC_CLASSPATH)
-       char *libpath;
-       s4    libpathlen;
-#endif
-
-       if (!p) {
-               *exceptionptr = new_nullpointerexception();
-               return;
-       }
-
-       /* get properties from system */
-
-       (void) getcwd(cwd, BUFFERSIZE);
-       java_home = getenv("JAVA_HOME");
-       user = getenv("USER");
-       home = getenv("HOME");
-       uname(&utsnamebuf);
-
-       /* search for method to add properties */
-
-       m = class_resolveclassmethod(p->header.vftbl->class,
-                                                                utf_new_char("put"),
-                                                                utf_new_char("(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"),
-                                                                clazz,
-                                                                true);
-
-       if (!m)
-               return;
-
-       insert_property(m, p, "java.version", VERSION);
-       insert_property(m, p, "java.vendor", "CACAO Team");
-       insert_property(m, p, "java.vendor.url", "http://www.cacaojvm.org/");
-       insert_property(m, p, "java.home", java_home ? java_home : CACAO_INSTALL_PREFIX);
-       insert_property(m, p, "java.vm.specification.version", "1.0");
-       insert_property(m, p, "java.vm.specification.vendor", "Sun Microsystems Inc.");
-       insert_property(m, p, "java.vm.specification.name", "Java Virtual Machine Specification");
-       insert_property(m, p, "java.vm.version", VERSION);
-       insert_property(m, p, "java.vm.vendor", "CACAO Team");
-       insert_property(m, p, "java.vm.name", "CACAO");
-       insert_property(m, p, "java.specification.version", "1.4");
-       insert_property(m, p, "java.specification.vendor", "Sun Microsystems Inc.");
-       insert_property(m, p, "java.specification.name", "Java Platform API Specification");
-       insert_property(m, p, "java.class.version", "48.0");
-       insert_property(m, p, "java.class.path", classpath);
-
-       /* Set bootclasspath properties. One for GNU classpath and the other for  */
-       /* compatibility with Sun (required by most applications).                */
-       insert_property(m, p, "java.boot.class.path", bootclasspath);
-       insert_property(m, p, "sun.boot.class.path", bootclasspath);
-
-#if defined(STATIC_CLASSPATH)
-       insert_property(m, p, "java.library.path" , ".");
-#else
-       libpathlen = strlen(CACAO_INSTALL_PREFIX) + strlen(CACAO_LIBRARY_PATH) + 1;
-
-       if (getenv("CACAO_LIB_OVERRIDE"))
-               libpathlen += strlen(getenv("CACAO_LIB_OVERRIDE")) + 1;
-
-       if (getenv("LD_LIBRARY_PATH"))
-               libpathlen += strlen(getenv("LD_LIBRARY_PATH")) + 1;
-
-       libpath = MNEW(char, libpathlen);
-
-       if (getenv("CACAO_LIB_OVERRIDE")) {
-               strcat(libpath, getenv("CACAO_LIB_OVERRIDE"));
-               strcat(libpath, ":");
-       }
-
-       strcat(libpath, CACAO_INSTALL_PREFIX);
-       strcat(libpath, CACAO_LIBRARY_PATH);
-
-       if (getenv("LD_LIBRARY_PATH")) {
-               strcat(libpath, ":");
-               strcat(libpath, getenv("LD_LIBRARY_PATH"));
-       }
-       insert_property(m, p, "java.library.path", libpath);
-
-       MFREE(libpath, char, libpathlen);
-#endif
-
-       insert_property(m, p, "java.io.tmpdir", "/tmp");
-
-       /* XXX We don't support java.lang.Compiler */
-/*     insert_property(m, p, "java.compiler", "cacao.jit"); */
-
-       insert_property(m, p, "java.ext.dirs", CACAO_INSTALL_PREFIX""CACAO_EXT_DIR);
-       insert_property(m, p, "os.name", utsnamebuf.sysname);
-       insert_property(m, p, "os.arch", utsnamebuf.machine);
-       insert_property(m, p, "os.version", utsnamebuf.release);
-       insert_property(m, p, "file.separator", "/");
-       /* insert_property(m, p, "file.encoding", "null"); -- this must be set properly */
-       insert_property(m, p, "path.separator", ":");
-       insert_property(m, p, "line.separator", "\n");
-       insert_property(m, p, "user.name", user ? user : "null");
-       insert_property(m, p, "user.home", home ? home : "null");
-       insert_property(m, p, "user.dir", cwd ? cwd : "null");
-
-#ifdef USE_GTK
-       /* disable gthread-jni's portable native sync due to yet unresolved 
-          threading issues */
-       insert_property(m, p, "gnu.classpath.awt.gtk.portable.native.sync", "false");
-#endif
-
-
-       /* get locales */
-       locale = getenv("LANG");
-       if (locale != NULL) { /* gnu classpath is going to set en as language */
-               if (strlen(locale) <= 2) {
-                       insert_property(m, p, "user.language", locale);
-               } else {
-                       if ((locale[2]=='_')&&(strlen(locale)>=5)) {
-                               lang = MNEW(char, 3);
-                               strncpy(lang, (char*)&locale[0], 2);
-                               lang[2]='\0';
-                               region = MNEW(char, 3);
-                               strncpy(region, (char*)&locale[3], 2);
-                               region[2]='\0';
-                               insert_property(m, p, "user.language", lang);
-                               insert_property(m, p, "user.region", region);
-                       }
-               }
-       }
-       
-       
-#if 0
-       /* how do we get them? */
-       { "user.country", "US" },
-       { "user.timezone", "Europe/Vienna" },
-
-       /* XXX do we need this one? */
-       { "java.protocol.handler.pkgs", "gnu.java.net.protocol"}
-#endif
-       insert_property(m, p, "java.protocol.handler.pkgs", "gnu.java.net.protocol");
-
-       /* insert properties defined on commandline */
-
-       while (properties) {
-               property *tp;
-
-               insert_property(m, p, properties->key, properties->value);
-
-               tp = properties;
-               properties = properties->next;
-               FREE(tp, property);
-       }
-
-       return;
-}
-
-
 /*
  * Class:     java_lang_VMRuntime
  * Method:    maxMemory