summaryrefslogtreecommitdiff
path: root/coreutils/split.c
diff options
context:
space:
mode:
authorDenys Vlasenko2013-07-13 23:49:45 +0200
committerDenys Vlasenko2013-07-13 23:49:45 +0200
commitc72b43c2f07e5fae288fff9e220b1f88e2889a72 (patch)
tree4577ff27d4aefdb610b3e26fbf13651f8a01c81d /coreutils/split.c
parent0dacb68e1a660b235f9098abd33577be2e147c67 (diff)
downloadbusybox-c72b43c2f07e5fae288fff9e220b1f88e2889a72.zip
busybox-c72b43c2f07e5fae288fff9e220b1f88e2889a72.tar.gz
Commonalize typical [b,]k,m suffix struct
function old new delta bkm_suffixes - 32 +32 static.km_suffixes 24 - -24 suffixes 32 - -32 static.bkm 32 - -32 head_tail_suffixes 32 - -32 ------------------------------------------------------------------------------ (add/remove: 2/6 grow/shrink: 0/0 up/down: 72/-160) Total: -88 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'coreutils/split.c')
-rw-r--r--coreutils/split.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/coreutils/split.c b/coreutils/split.c
index 11e6404..1e1673e 100644
--- a/coreutils/split.c
+++ b/coreutils/split.c
@@ -23,17 +23,15 @@
#include "libbb.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.
* Returns NULL if we are out of filenames.
@@ -86,7 +84,10 @@ int split_main(int argc UNUSED_PARAM, char **argv)
if (opt & SPLIT_OPT_l)
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";
argv += optind;