Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/libbb/dump.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/libbb/dump.c (modified) (25 diffs)

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

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Support code for the hexdump and od applets,
@@ -12 +13 @@
 
 #include "libbb.h"
-#include <string.h>
-#include <unistd.h>
-#include <ctype.h>      /* for isdigit() */
 #include "dump.h"
 
@@ -29 +27 @@
 int bb_dump_length = -1;        /* max bytes to read */
 
-static const char index_str[] = ".#-+ 0123456789";
-
-static const char size_conv_str[] =
+static const char index_str[] ALIGN1 = ".#-+ 0123456789";
+
+static const char size_conv_str[] ALIGN1 =
 "\x1\x4\x4\x4\x4\x4\x4\x8\x8\x8\x8\010cdiouxXeEfgG";
 
-static const char lcc[] = "diouxX";
+static const char lcc[] ALIGN1 = "diouxX";
 
 int bb_dump_size(FS * fs)
 {
-    register FU *fu;
-    register int bcnt, cur_size;
-    register char *fmt;
+    FU *fu;
+    int bcnt, cur_size;
+    char *fmt;
     const char *p;
     int prec;
@@ -77 +75 @@
         cur_size += bcnt * fu->reps;
     }
-    return (cur_size);
+    return cur_size;
 }
 
@@ -156 +154 @@
                 /* Unlike the original, output the remainder of the format string. */
                 if (!*byte_count_str) {
-                    bb_error_msg_and_die("bad byte count for conversion character %s.", p1);
+                    bb_error_msg_and_die("bad byte count for conversion character %s", p1);
                 }
                 pr->bcnt = *byte_count_str;
@@ -189 +187 @@
                     pr->bcnt = prec;
                 } else {    /* NOTOKAY */
-                    bb_error_msg_and_die("%%s requires a precision or a byte count.");
+                    bb_error_msg_and_die("%%s requires a precision or a byte count");
                 }
             } else if (*p1 == '_') {
@@ -223 +221 @@
             } else {
             DO_BAD_CONV_CHAR:
-                bb_error_msg_and_die("bad conversion character %%%s.\n", p1);
+                bb_error_msg_and_die("bad conversion character %%%s", p1);
             }
 
@@ -232 +230 @@
             savech = *p2;
             p1[1] = '\0';
-            pr->fmt = bb_xstrdup(fmtp);
+            pr->fmt = xstrdup(fmtp);
             *p2 = savech;
             pr->cchar = pr->fmt + (p1 - fmtp);
@@ -256 +254 @@
             /* only one conversion character if byte count */
             if (!(pr->flags & F_ADDRESS) && fu->bcnt && nconv++) {
-                bb_error_msg_and_die("byte count with multiple conversion characters.\n");
+                bb_error_msg_and_die("byte count with multiple conversion characters");
             }
         }
@@ -294 +292 @@
 }
 
-static void do_skip(char *fname, int statok)
+static void do_skip(const char *fname, int statok)
 {
     struct stat sbuf;
@@ -320 +318 @@
 static int next(char **argv)
 {
-    static int done;
+    static smallint done;
+
     int statok;
 
     if (argv) {
         _argv = argv;
-        return (1);
+        return 1;
     }
     for (;;) {
@@ -335 +334 @@
                 continue;
             }
-            statok = done = 1;
+            done = statok = 1;
         } else {
-            if (done++)
-                return (0);
+            if (done)
+                return 0;
+            done = 1;
             statok = 0;
         }
@@ -346 +346 @@
             ++_argv;
         if (!bb_dump_skip)
-            return (1);
+            return 1;
     }
     /* NOTREACHED */
@@ -353 +353 @@
 static unsigned char *get(void)
 {
-    static int ateof = 1;
-    static unsigned char *curp=NULL, *savp; /*DBU:[dave@cray.com]initialize curp */
-    register int n;
+    static smallint ateof = 1;
+    static unsigned char *curp = NULL, *savp; /*DBU:[dave@cray.com]initialize curp */
+
+    int n;
     int need, nread;
     unsigned char *tmpp;
@@ -361 +362 @@
     if (!curp) {
         address = (off_t)0; /*DBU:[dave@cray.com] initialize,initialize..*/
-        curp = (unsigned char *) xmalloc(bb_dump_blocksize);
-        savp = (unsigned char *) xmalloc(bb_dump_blocksize);
+        curp = xmalloc(bb_dump_blocksize);
+        savp = xmalloc(bb_dump_blocksize);
     } else {
         tmpp = curp;
@@ -377 +378 @@
         if (!bb_dump_length || (ateof && !next((char **) NULL))) {
             if (need == bb_dump_blocksize) {
-                return ((unsigned char *) NULL);
+                return NULL;
             }
             if (bb_dump_vflag != ALL && !memcmp(curp, savp, nread)) {
                 if (bb_dump_vflag != DUP) {
-                    printf("*\n");
-                }
-                return ((unsigned char *) NULL);
+                    puts("*");
+                }
+                return NULL;
             }
             memset((char *) curp + nread, 0, need);
             eaddress = address + nread;
-            return (curp);
+            return curp;
         }
         n = fread((char *) curp + nread, sizeof(unsigned char),
@@ -402 +403 @@
             bb_dump_length -= n;
         }
-        if (!(need -= n)) {
+        need -= n;
+        if (!need) {
             if (bb_dump_vflag == ALL || bb_dump_vflag == FIRST
                 || memcmp(curp, savp, bb_dump_blocksize)) {
@@ -408 +410 @@
                     bb_dump_vflag = WAIT;
                 }
-                return (curp);
+                return curp;
             }
             if (bb_dump_vflag == WAIT) {
-                printf("*\n");
+                puts("*");
             }
             bb_dump_vflag = DUP;
@@ -439 +441 @@
 }
 
-static const char conv_str[] =
+static const char conv_str[] ALIGN1 =
     "\0\\0\0"
     "\007\\a\0"             /* \a */
@@ -448 +450 @@
     "\t\\t\0"
     "\v\\v\0"
-    "\0";
+    ;
 
 
@@ -478 +480 @@
 static void conv_u(PR * pr, unsigned char * p)
 {
-    static const char list[] =
+    static const char list[] ALIGN1 =
         "nul\0soh\0stx\0etx\0eot\0enq\0ack\0bel\0"
         "bs\0_ht\0_lf\0_vt\0_ff\0_cr\0_so\0_si\0_"
@@ -503 +505 @@
 {
 /*  extern FU *endfu; */
-    register FS *fs;
-    register FU *fu;
-    register PR *pr;
-    register int cnt;
-    register unsigned char *bp;
+    FS *fs;
+    FU *fu;
+    PR *pr;
+    int cnt;
+    unsigned char *bp;
 
     off_t saveaddress;
@@ -651 +653 @@
 int bb_dump_dump(char **argv)
 {
-    register FS *tfs;
+    FS *tfs;
 
     /* figure out the data block bb_dump_size */
@@ -668 +670 @@
     display();
 
-    return (exitval);
+    return exitval;
 }
 
@@ -727 +729 @@
         /* byte count */
         if (isdigit(*p)) {
-            for (savep = p; isdigit(*p); ++p);
+// TODO: use bb_strtou
+            savep = p;
+            do p++; while (isdigit(*p));
             if (!isspace(*p)) {
                 bb_error_msg_and_die("bad format {%s}", fmt);