chpst: fix "env directory" parsing to not strip everything

[oweals/busybox.git] / scripts / basic / fixdep.c

diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index df3446e35e570fed911942900f0dff65125c698f..811d48b784ca08703e01c6560fc1874a89438d7c 100644 (file)
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -225,31 +225,36 @@ void use_config(char *m, int slen)
 void parse_config_file(char *map, size_t len)
 {
        /* modified for bbox */
-       char *end = map + len;
+       char *end_4 = map + len - 4; /* 4 == length of "USE_" */
+       char *end_7 = map + len - 7;
        char *p = map;
        char *q;
        int off;
 
-       for (; p < end; p++) {
-               if (!memcmp(p, "CONFIG_", 7)) goto conf7;
-               if (!memcmp(p, "ENABLE_", 7)) goto conf7;
-               if (!memcmp(p, "USE_", 4)) goto conf4;
-               if (!memcmp(p, "SKIP_", 5)) goto conf5;
+       for (; p < end_4; p++) {
+               if (p < end_7 && p[6] == '_') {
+                       if (!memcmp(p, "CONFIG", 6)) goto conf7;
+                       if (!memcmp(p, "ENABLE", 6)) goto conf7;
+               }
+               /* We have at least 5 chars: for() has
+                * "p < end-4", not "p <= end-4"
+                * therefore we don't need to check p <= end-5 here */
+               if (p[4] == '_')
+                       if (!memcmp(p, "SKIP", 4)) goto conf5;
+               /* Ehhh, gcc is too stupid to just compare it as 32bit int */
+               if (p[0] == 'U')
+                       if (!memcmp(p, "USE_", 4)) goto conf4;
                continue;
-       conf4:  off = 4; goto conf;
-       conf5:  off = 5; goto conf;
+
+       conf4:  off = 4;
+       conf5:  off = 5;
        conf7:  off = 7;
-       conf:
-               if (p > map + len - off)
-                       continue;
-               for (q = p + off; q < map + len; q++) {
+               p += off;
+               for (q = p; q < end_4+4; q++) {
                        if (!(isalnum(*q) || *q == '_'))
-                               goto found;
+                               break;
                }
-               continue;
-
-       found:
-               use_config(p+off, q-p-off);
+               use_config(p, q-p);
        }
 }
 
@@ -303,7 +308,7 @@ void parse_dep_file(void *map, size_t len)
        char *p;
        char s[PATH_MAX];
 
-       p = strchr(m, ':');
+       p = memchr(m, ':', len);
        if (!p) {
                fprintf(stderr, "fixdep: parse error\n");
                exit(1);
@@ -381,7 +386,7 @@ void traps(void)
 */
 }
 
-int main(int argc, char *argv[])
+int main(int argc, char **argv)
 {
        traps();