Merge branch 'busybox' into merge

3 files changed, 17 insertions, 17 deletions

diff --git a/scripts/basic/docproc.c b/scripts/basic/docproc.c
index bfc1a9844..2c7a19b83 100644
--- a/scripts/basic/docproc.c
+++ b/scripts/basic/docproc.c
@@ -197,10 +197,10 @@ void find_export_symbols(char * filename)
                         perror(real_filename);
                 }
                 while (fgets(line, MAXLINESZ, fp)) {
-                        char *p;
-                        char *e;
-                        if (((p = strstr(line, "EXPORT_SYMBOL_GPL")) != 0) ||
-                            ((p = strstr(line, "EXPORT_SYMBOL")) != 0)) {
+                        unsigned char *p;
+                        unsigned char *e;
+                        if (((p = (unsigned char *)strstr(line, "EXPORT_SYMBOL_GPL")) != 0) ||
+                            ((p = (unsigned char *)strstr(line, "EXPORT_SYMBOL")) != 0)) {
                                 /* Skip EXPORT_SYMBOL{_GPL} */
                                 while (isalnum(*p) || *p == '_')
                                         p++;
@@ -217,7 +217,7 @@ void find_export_symbols(char * filename)
                                 while (isalnum(*e) || *e == '_')
                                         e++;
                                 *e = '\0';
-                                add_new_symbol(sym, p);
+                                add_new_symbol(sym, (char*)p);
                         }
                 }
                 fclose(fp);
@@ -281,7 +281,7 @@ void singfunc(char * filename, char * line)
 
         /* Split line up in individual parameters preceded by FUNCTION */
         for (i=0; line[i]; i++) {
-                if (isspace(line[i])) {
+                if (isspace((unsigned char) line[i])) {
                         line[i] = '\0';
                         startofsym = 1;
                         continue;
@@ -308,10 +308,10 @@ void singfunc(char * filename, char * line)
 void parse_file(FILE *infile)
 {
         char line[MAXLINESZ];
-        char * s;
+        unsigned char * s;
         while (fgets(line, MAXLINESZ, infile)) {
                 if (line[0] == '!') {
-                        s = line + 2;
+                        s = (unsigned char *)line + 2;
                         switch (line[1]) {
                                 case 'E':
                                         while (*s && !isspace(*s)) s++;
@@ -335,7 +335,7 @@ void parse_file(FILE *infile)
                                         /* function names */
                                         while (isspace(*s))
                                                 s++;
-                                        singlefunctions(line +2, s);
+                                        singlefunctions(line +2, (char*)s);
                                         break;
                                 default:
                                         defaultline(line);
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index 9f461a65b..64fd92f06 100644
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -281,10 +281,10 @@ void use_config(char *m, int slen)
 void parse_config_file(char *map, size_t len)
 {
         /* modified for bbox */
-        char *end_3 = map + len - 3; /* 3 == length of "IF_" */
-        char *end_7 = map + len - 7;
-        char *p = map;
-        char *q;
+        unsigned char *end_3 = (unsigned char *)map + len - 3; /* 3 == length of "IF_" */
+        unsigned char *end_7 = (unsigned char *)map + len - 7;
+        unsigned char *p = (unsigned char *)map;
+        unsigned char *q;
         int off;
 
         for (; p <= end_3; p++) {
@@ -318,7 +318,7 @@ void parse_config_file(char *map, size_t len)
                                 break;
                 }
                 if (q != p) {
-                        use_config(p, q-p);
+                        use_config((char*)p, q - p);
                 }
         }
 }
@@ -391,7 +391,7 @@ void parse_dep_file(void *map, size_t len)
                 while (p < end && *p != ' ') p++;
                 if (p == m) break;
                 if (p == end) {
-                        do p--; while (p != m && !isalnum(*p));
+                        do p--; while (p != m && !isalnum((unsigned char)*p));
                         p++;
                 }
                 if (p == m) break;
diff --git a/scripts/basic/split-include.c b/scripts/basic/split-include.c
index 9a9260f2c..290bea2fb 100644
--- a/scripts/basic/split-include.c
+++ b/scripts/basic/split-include.c
@@ -118,7 +118,7 @@ int main(int argc, const char * argv [])
         /* We found #define CONFIG_foo or #undef CONFIG_foo.
          * Make the output file name. */
         str_config += sizeof(" CONFIG_") - 1;
-        for (itarget = 0; !isspace(str_config[itarget]); itarget++)
+        for (itarget = 0; !isspace((unsigned char)str_config[itarget]); itarget++)
         {
             int c = (unsigned char) str_config[itarget];
             if (isupper(c)) c = tolower(c);
@@ -133,7 +133,7 @@ int main(int argc, const char * argv [])
         is_same = 0;
         if ((fp_target = fopen(ptarget, "r")) != NULL)
         {
-            if (!fgets(old_line, buffer_size, fp_target))
+            if (!fgets(old_line, buffer_size, fp_target) && ferror(fp_target))
                 ERROR_EXIT(ptarget);
             if (fclose(fp_target) != 0)
                 ERROR_EXIT(ptarget);