* environ.cc (regopt): Scan HKLM if HKCU scan fails.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 01384d0..7a03dc2 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 22 17:11:25 2000  Christopher Faylor <cgf@cygnus.com>
+
+       * environ.cc (regopt): Scan HKLM if HKCU scan fails.
+
 Mon May 16 23:39:00 2000  Corinna Vinschen <corinna@vinschen.de>
 
        * dir.cc (rmdir): Care for misleading error messages

diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
index 7b9c33a..bb493b0 100644 (file)
--- a/winsup/cygwin/environ.cc
+++ b/winsup/cygwin/environ.cc
@@ -433,6 +433,12 @@ regopt (const char *name)
   MALLOC_CHECK;
   if (r.get_string (lname, buf, sizeof (buf) - 1, "") == ERROR_SUCCESS)
     parse_options (buf);
+  else
+    {
+      reg_key r1 (HKEY_LOCAL_MACHINE, KEY_READ, CYGWIN_INFO_PROGRAM_OPTIONS_NAME, NULL);
+      if (r1.get_string (lname, buf, sizeof (buf) - 1, "") == ERROR_SUCCESS)
+       parse_options (buf);
+    }
   MALLOC_CHECK;
 }