Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/libbb/dump.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/libbb/dump.c (modified) (10 diffs)

branches/3.2/mindi-busybox/libbb/dump.c

@@ -72 +72 @@
              * case it's a %s format.
              */
-            while (strchr(index_str + 1, *++fmt));
+            while (strchr(index_str + 1, *++fmt))
+                continue;
             if (*fmt == '.' && isdigit(*++fmt)) {
                 prec = atoi(fmt);
@@ -100 +101 @@
 {
     enum { NOTOKAY, USEBCNT, USEPREC } sokay;
-    PR *pr, **nextpr = NULL;
     FU *fu;
+    PR *pr;
     char *p1, *p2, *p3;
     char savech, *fmtp;
@@ -112 +113 @@
          * conversion character gets its own.
          */
-        for (nconv = 0, fmtp = fu->fmt; *fmtp; nextpr = &pr->nextpr) {
+        for (nconv = 0, fmtp = fu->fmt; *fmtp; ) {
             /* NOSTRICT */
             /* DBU:[dvae@cray.com] zalloc so that forward ptrs start out NULL*/
@@ -118 +119 @@
             if (!fu->nextpr)
                 fu->nextpr = pr;
-            /* ignore nextpr -- its unused inside the loop and is
-             * uninitialized 1st time through.
-             */
 
             /* skip preceding text and up to the next % sign */
@@ -296 +294 @@
      * repeat it as necessary.
      *
-     * if, rep count is greater than 1, no trailing whitespace
+     * if rep count is greater than 1, no trailing whitespace
      * gets output from the last iteration of the format unit.
      */
     for (fu = fs->nextfu; fu; fu = fu->nextfu) {
-        if (!fu->nextfu && fs->bcnt < dumper->blocksize
-         && !(fu->flags & F_SETREP) && fu->bcnt
+        if (!fu->nextfu
+         && fs->bcnt < dumper->blocksize
+         && !(fu->flags & F_SETREP)
+         && fu->bcnt
         ) {
             fu->reps += (dumper->blocksize - fs->bcnt) / fu->bcnt;
         }
-        if (fu->reps > 1) {
+        if (fu->reps > 1 && fu->nextpr) {
             for (pr = fu->nextpr;; pr = pr->nextpr)
                 if (!pr->nextpr)
@@ -725 +725 @@
     for (;;) {
         p = skip_whitespace(p);
-        if (!*p) {
+        if (*p == '\0') {
             break;
         }
@@ -753 +753 @@
         /* skip slash and trailing white space */
         if (*p == '/') {
-            p = skip_whitespace(++p);
+            p = skip_whitespace(p + 1);
         }
 
@@ -767 +767 @@
             tfu->bcnt = atoi(savep);
             /* skip trailing white space */
-            p = skip_whitespace(++p);
+            p = skip_whitespace(p + 1);
         }
 
@@ -775 +775 @@
         }
         for (savep = ++p; *p != '"';) {
-            if (*p++ == 0) {
+            if (*p++ == '\0') {
                 bb_error_msg_and_die("bad format {%s}", fmt);
             }
@@ -786 +786 @@
         /* alphabetic escape sequences have to be done in place */
         for (p2 = p1;; ++p1, ++p2) {
-            if (!*p1) {
+            if (*p1 == '\0') {
                 *p2 = *p1;
                 break;