--- OLD/popt/poptconfig.c	Thu Jan  1 00:00:00 1970
+++ NEW/popt/poptconfig.c	Thu Jan  1 00:00:00 1970
@@ -9,6 +9,8 @@
 #include "system.h"
 #include "poptint.h"
 
+#define ucisspace(x) isspace((unsigned char)(x))
+
 /*@-compmempass@*/	/* FIX: item->option.longName kept, not dependent. */
 static void configLine(poptContext con, char * line)
 	/*@modifies con @*/
@@ -28,20 +30,20 @@
     /*@=type@*/
 
     line += nameLength;
-    if (*line == '\0' || !isspace(*line)) return;
+    if (*line == '\0' || !ucisspace(*line)) return;
 
-    while (*line != '\0' && isspace(*line)) line++;
+    while (*line != '\0' && ucisspace(*line)) line++;
     entryType = line;
-    while (*line == '\0' || !isspace(*line)) line++;
+    while (*line == '\0' || !ucisspace(*line)) line++;
     *line++ = '\0';
 
-    while (*line != '\0' && isspace(*line)) line++;
+    while (*line != '\0' && ucisspace(*line)) line++;
     if (*line == '\0') return;
     opt = line;
-    while (*line == '\0' || !isspace(*line)) line++;
+    while (*line == '\0' || !ucisspace(*line)) line++;
     *line++ = '\0';
 
-    while (*line != '\0' && isspace(*line)) line++;
+    while (*line != '\0' && ucisspace(*line)) line++;
     if (*line == '\0') return;
 
     /*@-temptrans@*/ /* FIX: line alias is saved */
@@ -134,7 +136,7 @@
 	  case '\n':
 	    *dst = '\0';
 	    dst = buf;
-	    while (*dst && isspace(*dst)) dst++;
+	    while (*dst && ucisspace(*dst)) dst++;
 	    if (*dst && *dst != '#')
 		configLine(con, dst);
 	    chptr++;
@@ -167,6 +169,7 @@
     if (!con->appName) return 0;
     /*@=type@*/
 
+useEnv=useEnv;
     rc = poptReadConfigFile(con, "/etc/popt");
     if (rc) return rc;
     if (getuid() != geteuid()) return 0;