JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* cygcheck.cc (load_cygwin): Avoid calling putenv with a NULL path.

This commit is contained in:
Christopher Faylor 2005-05-16 03:18:29 +00:00
parent 2c64ff5451
commit 41dcb6199c
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
winsup/utils/ChangeLog
View File

@ -1,3 +1,7 @@
2005-05-15 Christopher Faylor <cgf@timesys.com>
* cygcheck.cc (load_cygwin): Avoid calling putenv with a NULL path.
2005-05-15 Corinna Vinschen <corinna@vinschen.de> 2005-05-15 Corinna Vinschen <corinna@vinschen.de>
* cygcheck.cc (load_cygwin): Don't touch $PATH for now. * cygcheck.cc (load_cygwin): Don't touch $PATH for now.

7
winsup/utils/cygcheck.cc
View File

@ -1466,12 +1466,15 @@ load_cygwin (int& argc, char **&argv)
char *path = NULL; char *path = NULL;
while (*_environ) while (*_environ)
{ {
if (!strncmp (*_environ, "PATH=", 5)) if (strncmp (*_environ, "PATH=", 5) == 0)
path = strdup (*_environ); path = strdup (*_environ);
nuke (*_environ); nuke (*_environ);
} }
for (char **ev = envp; *ev; ev++) for (char **ev = envp; *ev; ev++)
putenv (!strncmp (*ev, "PATH=", 5) ? path : *ev); if (strncmp (*ev, "PATH=", 5) != 0)
putenv (*ev);
else if (path)
putenv (path);
} }
} }