dd: code shrink

[oweals/busybox.git] / util-linux / hexdump.c

diff --git a/util-linux/hexdump.c b/util-linux/hexdump.c
index 1f5d57d74878a57f503192efea16cf023781e61e..ac7e24ff88022048d5a30aebfea20b34549d75ea 100644 (file)
--- a/util-linux/hexdump.c
+++ b/util-linux/hexdump.c
@@ -13,7 +13,6 @@
 //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:     "\nOptions:"
 //usage:     "\n       -b              One-byte octal display"
 //usage:     "\n       -c              One-byte character display"
 //usage:     "\n       -C              Canonical hex+ASCII, 16 bytes per line"
@@ -67,13 +66,6 @@ static const char add_first[] ALIGN1 = "\"%07.7_Ax\n\"";
 
 static const char hexdump_opts[] ALIGN1 = "bcdoxCe:f:n:s:v" IF_FEATURE_HEXDUMP_REVERSE("R");
 
-static const struct suffix_mult suffixes[] = {
-       { "b", 512 },
-       { "k", 1024 },
-       { "m", 1024*1024 },
-       { "", 0 }
-};
-
 int hexdump_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int hexdump_main(int argc, char **argv)
 {
@@ -117,7 +109,12 @@ int hexdump_main(int argc, char **argv)
                        dumper->dump_length = xatoi_positive(optarg);
                } /* else */
                if (ch == 's') { /* compat: -s accepts hex numbers too */
-                       dumper->dump_skip = xstrtoul_range_sfx(optarg, /*base:*/ 0, /*lo:*/ 0, /*hi:*/ LONG_MAX, suffixes);
+                       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;