Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/scripts/basic/fixdep.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/scripts/basic/fixdep.c (modified) (4 diffs)

branches/2.2.9/mindi-busybox/scripts/basic/fixdep.c

@@ -204 +204 @@
 void use_config(char *m, int slen)
 {
-    char s[PATH_MAX];
+    char *s = alloca(slen+1);
     char *p;
 
@@ -226 +226 @@
 {
     /* modified for bbox */
-    char *end_4 = map + len - 4; /* 4 == length of "USE_" */
+    char *end_3 = map + len - 3; /* 3 == length of "IF_" */
     char *end_7 = map + len - 7;
     char *p = map;
@@ -232 +232 @@
     int off;
 
-    for (; p < end_4; p++) {
+    for (; p <= end_3; p++) {
+        /* Find next identifier's beginning */
+        if (!(isalnum(*p) || *p == '_'))
+            continue;
+
+        /* Check it */
         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;
+            if (!memcmp(p, "IF_NOT", 6)) goto conf7;
+        }
+        /* we have at least 3 chars because of p <= end_3 */
+        /*if (!memcmp(p, "IF_", 3)) ...*/
+        if (p[0] == 'I' && p[1] == 'F' && p[2] == '_') {
+            off = 3;
+            goto conf;
+        }
+
+        /* This identifier is not interesting, skip it */
+        while (p <= end_3 && (isalnum(*p) || *p == '_'))
+            p++;
         continue;
 
-    conf4:  off = 4;
-    conf5:  off = 5;
     conf7:  off = 7;
+    conf:
         p += off;
-        for (q = p; q < end_4+4; q++) {
+        for (q = p; q < end_3+3; q++) {
             if (!(isalnum(*q) || *q == '_'))
                 break;
         }
-        use_config(p, q-p);
+        if (q != p) {
+            use_config(p, q-p);
+        }
     }
 }
@@ -307 +316 @@
     char *end = m + len;
     char *p;
-    char s[PATH_MAX];
+    char *s = alloca(len);
 
     p = memchr(m, ':', len);