rpm2cpio: handle bz2 too; code shrink

[oweals/busybox.git] / coreutils / od.c

diff --git a/coreutils/od.c b/coreutils/od.c
index 0de9def5a3c39eb7d4c97bd56c80cea5beeb996f..e4179a36d861022df771306c1715d37625c44f18 100644 (file)
--- a/coreutils/od.c
+++ b/coreutils/od.c
@@ -12,12 +12,11 @@
  */
 
 
-#include "busybox.h"
+#include "libbb.h"
 #if ENABLE_DESKTOP
 /* This one provides -t (busybox's own build script needs it) */
 #include "od_bloaty.c"
 #else
-#include <getopt.h>
 
 #include "dump.h"
 
@@ -25,7 +24,7 @@
 #define ishexdigit(c) (isxdigit)(c)
 
 static void
-odoffset(int argc, char ***argvp)
+odoffset(dumper_t *dumper, int argc, char ***argvp)
 {
        char *num, *p;
        int base;
@@ -58,7 +57,7 @@ odoffset(int argc, char ***argvp)
 
        base = 0;
        /*
-        * bb_dump_skip over leading '+', 'x[0-9a-fA-f]' or '0x', and
+        * skip over leading '+', 'x[0-9a-fA-f]' or '0x', and
         * set base.
         */
        if (p[0] == '+')
@@ -71,11 +70,13 @@ odoffset(int argc, char ***argvp)
                base = 16;
        }
 
-       /* bb_dump_skip over the number */
+       /* skip over the number */
        if (base == 16)
-               for (num = p; ishexdigit(*p); ++p);
+               for (num = p; ishexdigit(*p); ++p)
+                       continue;
        else
-               for (num = p; isdecdigit(*p); ++p);
+               for (num = p; isdecdigit(*p); ++p)
+                       continue;
 
        /* check for no number */
        if (num == p)
@@ -88,23 +89,23 @@ odoffset(int argc, char ***argvp)
                base = 10;
        }
 
-       bb_dump_skip = strtol(num, &end, base ? base : 8);
+       dumper->dump_skip = strtol(num, &end, base ? base : 8);
 
        /* if end isn't the same as p, we got a non-octal digit */
        if (end != p)
-               bb_dump_skip = 0;
+               dumper->dump_skip = 0;
        else {
                if (*p) {
                        if (*p == 'b') {
-                               bb_dump_skip *= 512;
+                               dumper->dump_skip *= 512;
                                ++p;
                        } else if (*p == 'B') {
-                               bb_dump_skip *= 1024;
+                               dumper->dump_skip *= 1024;
                                ++p;
                        }
                }
                if (*p)
-                       bb_dump_skip = 0;
+                       dumper->dump_skip = 0;
                else {
                        ++*argvp;
                        /*
@@ -121,9 +122,9 @@ odoffset(int argc, char ***argvp)
                                }
                                if (base == 10) {
                                        x_or_d = 'd';
-                               DO_X_OR_D:
-                                       bb_dump_fshead->nextfu->fmt[TYPE_OFFSET]
-                                               = bb_dump_fshead->nextfs->nextfu->fmt[TYPE_OFFSET]
+ DO_X_OR_D:
+                                       dumper->fshead->nextfu->fmt[TYPE_OFFSET]
+                                               = dumper->fshead->nextfs->nextfu->fmt[TYPE_OFFSET]
                                                = x_or_d;
                                }
                        }
@@ -131,7 +132,7 @@ odoffset(int argc, char ***argvp)
        }
 }
 
-static const char * const add_strings[] = {
+static const char *const add_strings[] = {
        "16/1 \"%3_u \" \"\\n\"",                               /* a */
        "8/2 \" %06o \" \"\\n\"",                               /* B, o */
        "16/1 \"%03o \" \"\\n\"",                               /* b */
@@ -147,51 +148,50 @@ static const char * const add_strings[] = {
        "4/4 \"    %011o \" \"\\n\"",                   /* O */
 };
 
-static const char od_opts[] = "aBbcDdeFfHhIiLlOoXxv";
+static const char od_opts[] ALIGN1 = "aBbcDdeFfHhIiLlOoXxv";
 
-static const char od_o2si[] = {
+static const char od_o2si[] ALIGN1 = {
        0, 1, 2, 3, 5,
        4, 6, 6, 7, 8,
        9, 0xa, 0xb, 0xa, 0xa,
        0xb, 1, 8, 9,
 };
 
-int od_main(int argc, char **argv);
+int od_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int od_main(int argc, char **argv)
 {
        int ch;
        int first = 1;
        char *p;
-       bb_dump_vflag = FIRST;
-       bb_dump_length = -1;
+       dumper_t *dumper = alloc_dumper();
 
        while ((ch = getopt(argc, argv, od_opts)) > 0) {
                if (ch == 'v') {
-                       bb_dump_vflag = ALL;
+                       dumper->dump_vflag = ALL;
                } else if (((p = strchr(od_opts, ch)) != NULL) && (*p != '\0')) {
                        if (first) {
                                first = 0;
-                               bb_dump_add("\"%07.7_Ao\n\"");
-                               bb_dump_add("\"%07.7_ao  \"");
+                               bb_dump_add(dumper, "\"%07.7_Ao\n\"");
+                               bb_dump_add(dumper, "\"%07.7_ao  \"");
                        } else {
-                               bb_dump_add("\"         \"");
+                               bb_dump_add(dumper, "\"         \"");
                        }
-                       bb_dump_add(add_strings[(int)od_o2si[(p-od_opts)]]);
+                       bb_dump_add(dumper, add_strings[(int)od_o2si[(p - od_opts)]]);
                } else {        /* P, p, s, w, or other unhandled */
                        bb_show_usage();
                }
        }
-       if (!bb_dump_fshead) {
-               bb_dump_add("\"%07.7_Ao\n\"");
-               bb_dump_add("\"%07.7_ao  \" 8/2 \"%06o \" \"\\n\"");
+       if (!dumper->fshead) {
+               bb_dump_add(dumper, "\"%07.7_Ao\n\"");
+               bb_dump_add(dumper, "\"%07.7_ao  \" 8/2 \"%06o \" \"\\n\"");
        }
 
        argc -= optind;
        argv += optind;
 
-       odoffset(argc, &argv);
+       odoffset(dumper, argc, &argv);
 
-       return bb_dump_dump(argv);
+       return bb_dump_dump(dumper, argv);
 }
 #endif /* ENABLE_DESKTOP */