Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/util-linux/hexdump.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/util-linux/hexdump.c (modified) (5 diffs)

branches/2.2.5/mindi-busybox/util-linux/hexdump.c

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
  * hexdump implementation for busybox
@@ -9 +10 @@
  */
 
-#include "busybox.h"
 #include <getopt.h>
-#include <string.h>
+#include "libbb.h"
 #include "dump.h"
+
+/* This is a NOEXEC applet. Be very careful! */
+
 
 static void bb_dump_addfile(char *name)
 {
-    register char *p;
+    char *p;
     FILE *fp;
     char *buf;
 
-    fp = bb_xfopen(name, "r");
+    fp = xfopen(name, "r");
 
-    while ((buf = bb_get_chomped_line_from_file(fp)) != NULL) {
+    while ((buf = xmalloc_getline(fp)) != NULL) {
         p = skip_whitespace(buf);
 
@@ -33 +36 @@
 }
 
-static const char * const add_strings[] = {
-            "\"%07.7_ax \" 16/1 \"%03o \" \"\\n\"",     /* b */
-            "\"%07.7_ax \" 16/1 \"%3_c \" \"\\n\"",     /* c */
-            "\"%07.7_ax \" 8/2 \"  %05u \" \"\\n\"",    /* d */
-            "\"%07.7_ax \" 8/2 \" %06o \" \"\\n\"",     /* o */
-            "\"%07.7_ax \" 8/2 \"   %04x \" \"\\n\"",   /* x */
+static const char *const add_strings[] = {
+    "\"%07.7_ax \" 16/1 \"%03o \" \"\\n\"",     /* b */
+    "\"%07.7_ax \" 16/1 \"%3_c \" \"\\n\"",     /* c */
+    "\"%07.7_ax \" 8/2 \"  %05u \" \"\\n\"",    /* d */
+    "\"%07.7_ax \" 8/2 \" %06o \" \"\\n\"",     /* o */
+    "\"%07.7_ax \" 8/2 \"   %04x \" \"\\n\"",   /* x */
 };
 
-static const char add_first[] = "\"%07.7_Ax\n\"";
+static const char add_first[] ALIGN1 = "\"%07.7_Ax\n\"";
 
-static const char hexdump_opts[] = "bcdoxCe:f:n:s:v";
+static const char hexdump_opts[] ALIGN1 = "bcdoxCe:f:n:s:v";
 
 static const struct suffix_mult suffixes[] = {
-    {"b",  512 },
-    {"k",  1024 },
-    {"m",  1024*1024 },
-    {NULL, 0 }
+    { "b", 512 },
+    { "k", 1024 },
+    { "m", 1024*1024 },
+    { }
 };
 
+int hexdump_main(int argc, char **argv);
 int hexdump_main(int argc, char **argv)
 {
-//  register FS *tfs;
     const char *p;
     int ch;
@@ -62 +65 @@
 
     while ((ch = getopt(argc, argv, hexdump_opts)) > 0) {
-        if ((p = strchr(hexdump_opts, ch)) != NULL) {
-            if ((p - hexdump_opts) < 5) {
-                bb_dump_add(add_first);
-                bb_dump_add(add_strings[(int)(p - hexdump_opts)]);
-            } else if (ch == 'C') {
-                    bb_dump_add("\"%08.8_Ax\n\"");
-                bb_dump_add("\"%08.8_ax  \" 8/1 \"%02x \" \"  \" 8/1 \"%02x \" ");
-                    bb_dump_add("\"  |\" 16/1 \"%_p\" \"|\\n\"");
-            } else {
-                /* Sae a little bit of space below by omitting the 'else's. */
-                if (ch == 'e') {
-                    bb_dump_add(optarg);
-                } /* else */
-                if (ch == 'f') {
-                    bb_dump_addfile(optarg);
-                } /* else */
-                if (ch == 'n') {
-                    bb_dump_length = bb_xgetularg10_bnd(optarg, 0, INT_MAX);
-                } /* else */
-                if (ch == 's') {
-                    bb_dump_skip = bb_xgetularg_bnd_sfx(optarg, 10, 0, LONG_MAX, suffixes);
-                } /* else */
-                if (ch == 'v') {
-                    bb_dump_vflag = ALL;
-                }
+        p = strchr(hexdump_opts, ch);
+        if (!p)
+            bb_show_usage();
+        if ((p - hexdump_opts) < 5) {
+            bb_dump_add(add_first);
+            bb_dump_add(add_strings[(int)(p - hexdump_opts)]);
+        } else if (ch == 'C') {
+            bb_dump_add("\"%08.8_Ax\n\"");
+            bb_dump_add("\"%08.8_ax  \" 8/1 \"%02x \" \"  \" 8/1 \"%02x \" ");
+            bb_dump_add("\"  |\" 16/1 \"%_p\" \"|\\n\"");
+        } else {
+            /* Save a little bit of space below by omitting the 'else's. */
+            if (ch == 'e') {
+                bb_dump_add(optarg);
+            } /* else */
+            if (ch == 'f') {
+                bb_dump_addfile(optarg);
+            } /* else */
+            if (ch == 'n') {
+                bb_dump_length = xatoi_u(optarg);
+            } /* else */
+            if (ch == 's') {
+                bb_dump_skip = xatoul_range_sfx(optarg, 0, LONG_MAX, suffixes);
+            } /* else */
+            if (ch == 'v') {
+                bb_dump_vflag = ALL;
             }
-        } else {
-            bb_show_usage();
         }
     }
@@ -100 +102 @@
     argv += optind;
 
-    return(bb_dump_dump(argv));
+    return bb_dump_dump(argv);
 }