Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/coreutils/split.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/coreutils/split.c (modified) (3 diffs)

branches/3.3/mindi-busybox/coreutils/split.c

@@ -23 +23 @@
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
-static const struct suffix_mult split_suffices[] = {
 #if ENABLE_FEATURE_SPLIT_FANCY
+static const struct suffix_mult split_suffixes[] = {
     { "b", 512 },
-#endif
     { "k", 1024 },
     { "m", 1024*1024 },
-#if ENABLE_FEATURE_SPLIT_FANCY
     { "g", 1024*1024*1024 },
-#endif
     { "", 0 }
 };
+#endif
 
 /* Increment the suffix part of the filename.
@@ -81 +80 @@
     char *src;
 
+    setup_common_bufsiz();
+
     opt_complementary = "?2:a+"; /* max 2 args; -a N */
     opt = getopt32(argv, "l:b:a:", &count_p, &count_p, &suffix_len);
@@ -87 +88 @@
         cnt = XATOOFF(count_p);
     if (opt & SPLIT_OPT_b) // FIXME: also needs XATOOFF
-        cnt = xatoull_sfx(count_p, split_suffices);
+        cnt = xatoull_sfx(count_p,
+                IF_FEATURE_SPLIT_FANCY(split_suffixes)
+                IF_NOT_FEATURE_SPLIT_FANCY(km_suffixes)
+        );
     sfx = "x";