Changeset 252 for trunk

Timestamp:

Jan 28, 2011, 11:17:17 AM (15 years ago)

Author:

dmik

Message:

hotspot: Use LIBPATH to comprise java.library.path instead of PATH on OS/2.

Location:

trunk/openjdk/hotspot/src/os

Files:

• os2/vm/os_os2.cpp (modified) (1 diff)
• windows/vm/os_windows.cpp (modified) (2 diffs)

trunk/openjdk/hotspot/src/os/os2/vm/os_os2.cpp

@@ -217 +217 @@
     return MIN2(size, maxMemBlock);
 }
+
+// Extracts the LIBPATH value from CONFIG.SYS and puts it to the environment
+// under the JAVA_LIBPATH name unless JAVA_LIBPATH is already set in which
+// case the existing value is simply returned.
+const char *getLibPath()
+{
+    const char *libPath = ::getenv("JAVA_LIBPATH");
+    if (libPath)
+        return libPath;
+
+    os2_APIRET arc;
+    os2_ULONG drive;
+    arc = DosQuerySysInfo(os2_QSV_BOOT_DRIVE, os2_QSV_BOOT_DRIVE,
+                          &drive, sizeof(drive));
+    if (arc != os2_NO_ERROR)
+        return NULL;
+
+    char configSys[] = "?:\\CONFIG.SYS";
+    *configSys = drive + 'A' - 1;
+
+    FILE *f = fopen(configSys, "r");
+    if (!f)
+        return NULL;
+
+    char buf[1024];
+    char *libPathBuf = NULL;
+    while (!feof(f) && !ferror(f)) {
+        if (fgets(buf, sizeof(buf), f)) {
+            int len = strlen(buf);
+            if (libPathBuf) {
+                // continuation of the LIBPATH string
+                libPathBuf = (char *)realloc(libPathBuf, strlen(libPathBuf) + len + 2);
+                if (!libPathBuf)
+                    break;
+            }
+            else if (!strncmp(buf, "LIBPATH", 7)) {
+                // beginning of the LIBPATH string
+                libPathBuf = (char *)malloc(len + 1 + 5 /*JAVA_*/);
+                if (!libPathBuf)
+                    break;
+                strcpy(libPathBuf, "JAVA_");
+            }
+            if (libPathBuf) {
+                strcat(libPathBuf, buf);
+                if (buf[len - 1] == '\n') {
+                    // this is the last part, terminate and leave
+                    libPathBuf[strlen(libPathBuf) - 1] = '\0';
+                    break;
+                }
+            }
+        }
+    }
+
+    fclose(f);
+
+    ::putenv(libPathBuf);
+    return ::getenv("JAVA_LIBPATH");
+}

trunk/openjdk/hotspot/src/os/windows/vm/os_windows.cpp

@@ -159 +159 @@
 LONG WINAPI Handle_FLT_Exception(struct _EXCEPTION_POINTERS* exceptionInfo);
 #endif
+
+#ifdef __WIN32OS2__
+const char *getLibPath(); // defined in os_os2.cpp
+#endif
+
 void os::init_system_properties_values() {
   /* sysclasspath, java_home, dll_dir */
@@ -216 +221 @@
     char *library_path;
     char tmp[MAX_PATH];
+
+#ifdef __WIN32OS2__
+    /* On OS/2, LIBPATH is used for DLL searching insetad of PATH */
+    const char *path_str = getLibPath();
+#else
     char *path_str = ::getenv("PATH");
+#endif
 
     library_path = NEW_C_HEAP_ARRAY(char, MAX_PATH * 5 + sizeof(PACKAGE_DIR) +