diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2008-11-05 11:57:44 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2008-11-05 11:57:44 +0000 |
| commit | c6b7418c8969ee21f2610e21269517ba81c20386 (patch) | |
| tree | daa962b78fb53bbd99258b4cdc686fac24a3cdaa | |
| parent | 1dc1ccd4aef6165bcdb88240dc422aa67c9ef930 (diff) | |
| download | cygnal-c6b7418c8969ee21f2610e21269517ba81c20386.tar.gz cygnal-c6b7418c8969ee21f2610e21269517ba81c20386.tar.bz2 cygnal-c6b7418c8969ee21f2610e21269517ba81c20386.zip | |
* environ.cc (environ_init): Avoid evaluating $CYGWIN twice.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/cygwin/environ.cc | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 136805c91..5e3ee1cd9 100644 --- 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 040a638e8..7f4064a68 100644 --- 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]); |