From 41dcb6199c7c905ae3bcfc8ffa6c3c3310435818 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Mon, 16 May 2005 03:18:29 +0000
Subject: * cygcheck.cc (load_cygwin): Avoid calling putenv with a NULL path.

---
 winsup/utils/cygcheck.cc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'winsup/utils/cygcheck.cc')

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);
     }
 }
 
-- 
cgit v1.2.3