Bump to version 1.22.1

[platform/upstream/busybox.git] / util-linux / hexdump.c

diff --git a/util-linux/hexdump.c b/util-linux/hexdump.c
index 4d2b059..ac7e24f 100644 (file)
--- a/util-linux/hexdump.c
+++ b/util-linux/hexdump.c
@@ -4,28 +4,48 @@
  * Based on code from util-linux v 2.11l
  *
  * Copyright (c) 1989
- *     The Regents of the University of California.  All rights reserved.
+ * The Regents of the University of California.  All rights reserved.
  *
- * Licensed under GPLv2 or later, see file License in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
+//usage:#define hexdump_trivial_usage
+//usage:       "[-bcCdefnosvx" IF_FEATURE_HEXDUMP_REVERSE("R") "] [FILE]..."
+//usage:#define hexdump_full_usage "\n\n"
+//usage:       "Display FILEs (or stdin) in a user specified format\n"
+//usage:     "\n       -b              One-byte octal display"
+//usage:     "\n       -c              One-byte character display"
+//usage:     "\n       -C              Canonical hex+ASCII, 16 bytes per line"
+//usage:     "\n       -d              Two-byte decimal display"
+//usage:     "\n       -e FORMAT_STRING"
+//usage:     "\n       -f FORMAT_FILE"
+//usage:     "\n       -n LENGTH       Interpret only LENGTH bytes of input"
+//usage:     "\n       -o              Two-byte octal display"
+//usage:     "\n       -s OFFSET       Skip OFFSET bytes"
+//usage:     "\n       -v              Display all input data"
+//usage:     "\n       -x              Two-byte hexadecimal display"
+//usage:       IF_FEATURE_HEXDUMP_REVERSE(
+//usage:     "\n       -R              Reverse of 'hexdump -Cv'")
+//usage:
+//usage:#define hd_trivial_usage
+//usage:       "FILE..."
+//usage:#define hd_full_usage "\n\n"
+//usage:       "hd is an alias for hexdump -C"
+
 #include "libbb.h"
 #include "dump.h"
 
 /* This is a NOEXEC applet. Be very careful! */
 
-
 static void bb_dump_addfile(dumper_t *dumper, char *name)
 {
        char *p;
        FILE *fp;
        char *buf;
 
-       fp = xfopen(name, "r");
-
+       fp = xfopen_for_read(name);
        while ((buf = xmalloc_fgetline(fp)) != NULL) {
                p = skip_whitespace(buf);
-
                if (*p && (*p != '#')) {
                        bb_dump_add(dumper, p);
                }
@@ -35,23 +55,16 @@ static void bb_dump_addfile(dumper_t *dumper, char *name)
 }
 
 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 */
+       "\"%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[] ALIGN1 = "\"%07.7_Ax\n\"";
 
-static const char hexdump_opts[] ALIGN1 = "bcdoxCe:f:n:s:v" USE_FEATURE_HEXDUMP_REVERSE("R");
-
-static const struct suffix_mult suffixes[] = {
-       { "b", 512 },
-       { "k", 1024 },
-       { "m", 1024*1024 },
-       { }
-};
+static const char hexdump_opts[] ALIGN1 = "bcdoxCe:f:n:s:v" IF_FEATURE_HEXDUMP_REVERSE("R");
 
 int hexdump_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int hexdump_main(int argc, char **argv)
@@ -93,10 +106,15 @@ int hexdump_main(int argc, char **argv)
                        bb_dump_addfile(dumper, optarg);
                } /* else */
                if (ch == 'n') {
-                       dumper->dump_length = xatoi_u(optarg);
+                       dumper->dump_length = xatoi_positive(optarg);
                } /* else */
-               if (ch == 's') {
-                       dumper->dump_skip = xatoul_range_sfx(optarg, 0, LONG_MAX, suffixes);
+               if (ch == 's') { /* compat: -s accepts hex numbers too */
+                       dumper->dump_skip = xstrtoull_range_sfx(
+                               optarg,
+                               /*base:*/ 0,
+                               /*lo:*/ 0, /*hi:*/ OFF_T_MAX,
+                               bkm_suffixes
+                       );
                } /* else */
                if (ch == 'v') {
                        dumper->dump_vflag = ALL;
@@ -131,7 +149,7 @@ int hexdump_main(int argc, char **argv)
 
        do {
                char *buf;
-               fp = xfopen(*argv, "r");
+               fp = xfopen_for_read(*argv);
  jump_in:
                while ((buf = xmalloc_fgetline(fp)) != NULL) {
                        p = buf;