Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/util-linux/hexdump.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/util-linux/hexdump.c (modified) (2 diffs)

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

@@ -67 +67 @@
 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 +110 @@
         } /* 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') {