Merge pull request #7472 from tkelman/isspace-uchar

cast to unsigned char for each use of isspace

src/builtins.c

@@ -609,7 +609,7 @@ DLLEXPORT int jl_substrtod(char *str, size_t offset, int len, double *out)
     char *bstr = str+offset;
     char *pend = bstr+len;
     int err = 0;
-    if (!(*pend == '\0' || isspace(*pend) || *pend == ',')) {
+    if (!(*pend == '\0' || isspace((unsigned char)*pend) || *pend == ',')) {
         // confusing data outside substring. must copy.
         char *newstr = malloc(len+1);
         memcpy(newstr, bstr, len);
@@ -635,7 +635,7 @@ DLLEXPORT int jl_strtod(char *str, double *out)
         (errno==ERANGE && (*out==0 || *out==HUGE_VAL || *out==-HUGE_VAL)))
         return 1;
     while (*p != '\0') {
-        if (!isspace(*p))
+        if (!isspace((unsigned char)*p))
             return 1;
         p++;
     }
@@ -654,7 +654,7 @@ DLLEXPORT int jl_substrtof(char *str, int offset, int len, float *out)
     char *bstr = str+offset;
     char *pend = bstr+len;
     int err = 0;
-    if (!(*pend == '\0' || isspace(*pend) || *pend == ',')) {
+    if (!(*pend == '\0' || isspace((unsigned char)*pend) || *pend == ',')) {
         // confusing data outside substring. must copy.
         char *newstr = malloc(len+1);
         memcpy(newstr, bstr, len);
@@ -689,7 +689,7 @@ DLLEXPORT int jl_strtof(char *str, float *out)
         (errno==ERANGE && (*out==0 || *out==HUGE_VALF || *out==-HUGE_VALF)))
         return 1;
     while (*p != '\0') {
-        if (!isspace(*p))
+        if (!isspace((unsigned char)*p))
             return 1;
         p++;
     }

src/ccall.cpp

@@ -17,9 +17,9 @@ extern "C" DLLEXPORT void jl_read_sonames(void)
         ssize_t n = getline(&line, &sz, ldc);
         if (n == -1)
             break;
-        if (n > 2 && isspace(line[0])) {
+        if (n > 2 && isspace((unsigned char)line[0])) {
             int i=0;
-            while (isspace(line[++i])) ;
+            while (isspace((unsigned char)line[++i])) ;
             char *name = &line[i];
             char *dot = strstr(name, ".so");
             i=0;
@@ -28,10 +28,10 @@ extern "C" DLLEXPORT void jl_read_sonames(void)
                 continue;
 
             // Detect if this entry is for the current architecture
-            while (!isspace(dot[++i])) ;
-            while (isspace(dot[++i])) ;
+            while (!isspace((unsigned char)dot[++i])) ;
+            while (isspace((unsigned char)dot[++i])) ;
             int j = i;
-            while (!isspace(dot[++j])) ;
+            while (!isspace((unsigned char)dot[++j])) ;
             char *arch = strstr(dot+i,"x86-64");
             if (arch != NULL && arch < dot + j) {
 #ifdef _P32

src/flisp/read.c

@@ -149,7 +149,7 @@ static char nextchar(void)
             } while ((char)ch != '\n');
             c = (char)ch;
         }
-    } while (c==' ' || isspace(c));
+    } while (c==' ' || isspace((unsigned char)c));
     return c;
 }
 

src/support/strtod.c

@@ -133,7 +133,7 @@ double strtod_c(const char *nptr, char **endptr)
     p = nptr;
 
     /* parse leading spaces */
-    while (isspace(*p)) {
+    while (isspace((unsigned char)*p)) {
         p++;
     }