summaryrefslogtreecommitdiffstats
path: root/winsup/utils/cygcheck.cc
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2005-05-16 03:18:29 +0000
committerChristopher Faylor <me@cgf.cx>2005-05-16 03:18:29 +0000
commit41dcb6199c7c905ae3bcfc8ffa6c3c3310435818 (patch)
treea4b066a345efbdfe26c6cf732ece841717efe411 /winsup/utils/cygcheck.cc
parent2c64ff5451a37b403fbb14d7d88784c2276f3b56 (diff)
downloadcygnal-41dcb6199c7c905ae3bcfc8ffa6c3c3310435818.tar.gz
cygnal-41dcb6199c7c905ae3bcfc8ffa6c3c3310435818.tar.bz2
cygnal-41dcb6199c7c905ae3bcfc8ffa6c3c3310435818.zip
* cygcheck.cc (load_cygwin): Avoid calling putenv with a NULL path.
Diffstat (limited to 'winsup/utils/cygcheck.cc')
-rw-r--r--winsup/utils/cygcheck.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc
index afd43175c..fc334cee8 100644
--- a/winsup/utils/cygcheck.cc
+++ b/winsup/utils/cygcheck.cc
@@ -1466,12 +1466,15 @@ load_cygwin (int& argc, char **&argv)
char *path = NULL;
while (*_environ)
{
- if (!strncmp (*_environ, "PATH=", 5))
+ if (strncmp (*_environ, "PATH=", 5) == 0)
path = strdup (*_environ);
nuke (*_environ);
}
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);
}
}