Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/modutils/modutils-24.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/modutils/modutils-24.c (modified) (5 diffs)

branches/3.2/mindi-busybox/modutils/modutils-24.c

@@ -61 +61 @@
 #include "libbb.h"
 #include "modutils.h"
-#include <libgen.h>
 #include <sys/utsname.h>
 
@@ -2445 +2444 @@
 
         /* Number of parameters */
+        min = max = 1;
         if (isdigit(*pinfo)) {
-            min = strtoul(pinfo, &pinfo, 10);
+            min = max = strtoul(pinfo, &pinfo, 10);
             if (*pinfo == '-')
                 max = strtoul(pinfo + 1, &pinfo, 10);
-            else
-                max = min;
-        } else
-            min = max = 1;
+        }
 
         contents = f->sections[sym->secidx]->contents;
@@ -2474 +2471 @@
         n = 0;
         p = val;
-        while (*p != 0) {
+        while (*p) {
             char sv_ch;
             char *endp;
@@ -2485 +2482 @@
                 len = strcspn(p, ",");
                 sv_ch = p[len];
-                p[len] = 0;
+                p[len] = '\0';
                 obj_string_patch(f, sym->secidx,
                          loc - contents, p);
@@ -2495 +2492 @@
                 len = strcspn(p, ",");
                 sv_ch = p[len];
-                p[len] = 0;
+                p[len] = '\0';
                 if (len >= charssize)
                     bb_error_msg_and_die("string too long for %s (max %ld)", param,