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

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

Location:

branches/2.2.9/mindi-busybox/scripts/basic

Files:

• .gitignore (added)
• docproc.c (modified) (4 diffs)
• fixdep.c (modified) (4 diffs)
• split-include.c (modified) (2 diffs)

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

@@ -80 +80 @@
     pid_t pid;
     int ret;
-    char real_filename[PATH_MAX + 1];
+    char *real_filename;
+    int rflen;
+
     /* Make sure output generated so far are flushed */
     fflush(stdout);
     switch(pid=fork()) {
         case -1:
-            perror("fork");
+            perror("vfork"+1);
             exit(1);
         case  0:
-            memset(real_filename, 0, sizeof(real_filename));
-            strncat(real_filename, getenv("SRCTREE"), PATH_MAX);
-            strncat(real_filename, KERNELDOCPATH KERNELDOC,
-                    PATH_MAX - strlen(real_filename));
+            rflen  = strlen(getenv("SRCTREE"));
+            rflen += strlen(KERNELDOCPATH KERNELDOC);
+            real_filename = alloca(rflen + 1);
+            strcpy(real_filename, getenv("SRCTREE"));
+            strcat(real_filename, KERNELDOCPATH KERNELDOC);
             execvp(real_filename, svec);
             fprintf(stderr, "exec ");
@@ -167 +170 @@
     char line[MAXLINESZ];
     if (filename_exist(filename) == NULL) {
-        char real_filename[PATH_MAX + 1];
-        memset(real_filename, 0, sizeof(real_filename));
-        strncat(real_filename, getenv("SRCTREE"), PATH_MAX);
-        strncat(real_filename, filename,
-                PATH_MAX - strlen(real_filename));
+        int rflen = strlen(getenv("SRCTREE")) + strlen(filename);
+        char *real_filename = alloca(rflen + 1);
+        strcpy(real_filename, getenv("SRCTREE"));
+        strcat(real_filename, filename);
         sym = add_new_file(filename);
         fp = fopen(real_filename, "r");
@@ -250 +252 @@
 
 /*
- * Document spåecific function(s) in a file.
+ * Document specific function(s) in a file.
  * Call kernel-doc with the following parameters:
  * kernel-doc -docbook -function function1 [-function function2]
@@ -396 +398 @@
     return exitstatus;
 }
-

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);

branches/2.2.9/mindi-busybox/scripts/basic/split-include.c

@@ -111 +111 @@
     if (line[0] != '#')
         continue;
-    if ((str_config = strstr(line, "CONFIG_")) == NULL)
+    if ((str_config = strstr(line, " CONFIG_")) == NULL)
         continue;
 
-    /* Make the output file name. */
-    str_config += sizeof("CONFIG_") - 1;
+    /* 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++)
     {
@@ -155 +156 @@
 
         /* Write the file. */
-        if ((fp_target = fopen(ptarget, "w" )) == NULL)
+        if ((fp_target = fopen(ptarget,  "w")) == NULL)
         ERROR_EXIT(ptarget);
         fputs(line, fp_target);