* environ.cc (environ_init): Avoid evaluating $CYGWIN twice.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 136805c..5e3ee1c 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-05  Corinna Vinschen  <corinna@vinschen.de>
+
+       * environ.cc (environ_init): Avoid evaluating $CYGWIN twice.
+
 2008-10-23  Corinna Vinschen  <corinna@vinschen.de>
 
        * wincap.cc (all wincaps): Store in .cygwin_dll_common section same as

diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
index 040a638..7f4064a 100644 (file)
--- a/winsup/cygwin/environ.cc
+++ b/winsup/cygwin/environ.cc
@@ -792,8 +792,6 @@ environ_init (char **envp, int envc)
        ucenv (newp, eq);
       if (*newp == 'T' && strncmp (newp, "TERM=", 5) == 0)
        sawTERM = 1;
-      if (*newp == 'C' && strncmp (newp, "CYGWIN=", sizeof ("CYGWIN=") - 1) == 0)
-       parse_options (newp + sizeof ("CYGWIN=") - 1);
       if (*eq && conv_start_chars[(unsigned char)envp[i][0]])
        posify (envp + i, *++eq ? eq : --eq, tmpbuf);
       debug_printf ("%p: %s", envp[i], envp[i]);