Changeset 148

Timestamp:

Sep 5, 2010, 9:06:28 PM (15 years ago)

Author:

dmik

Message:

jdk: Use the %HOME% environment variable for detecting user.home before looking into the registry on OS/2.

File:

• trunk/openjdk/jdk/src/windows/native/java/lang/java_props_md.c (modified) (2 diffs)

trunk/openjdk/jdk/src/windows/native/java/lang/java_props_md.c

@@ -906 +906 @@
      */
     {
-        char *homep = getHomeFromRegistry();
+        char *homep;
+#ifdef __WIN32OS2__
+        /* On OS/2, using %HOME% (if defined) makes much more senese than going
+         * the Windows way */
+        homep = getenv("HOME");
+        if (homep == NULL) {
+#endif
+        homep = getHomeFromRegistry();
         if (homep == NULL) {
             homep = getHomeFromShell32();
@@ -913 +920 @@
             }
         }
+#ifdef __WIN32OS2__
+        }
+#endif
         sprops.user_home = homep;
     }