summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAri Sundholm2015-03-22 17:55:38 +0100
committerDenys Vlasenko2015-03-22 17:56:38 +0100
commit911db16229d41f53b9c44272fcccdb3552a5a99e (patch)
tree61085234d4d581f6adab360171508470c1074f92
parent8893023ba27ea87b12a333960271c9f86cdebf7b (diff)
downloadbusybox-911db16229d41f53b9c44272fcccdb3552a5a99e.zip
busybox-911db16229d41f53b9c44272fcccdb3552a5a99e.tar.gz
truncate: new applet
function old new delta truncate_main - 161 +161 cwbkMG_suffixes - 128 +128 packed_usage 30443 30459 +16 applet_names 2512 2521 +9 applet_main 1456 1460 +4 parse_command 1460 1463 +3 applet_nameofs 728 730 +2 applet_install_loc 182 183 +1 dd_suffixes 112 - -112 ------------------------------------------------------------------------------ (add/remove: 3/1 grow/shrink: 10/3 up/down: 337/-133) Total: 204 bytes Signed-off-by: Ari Sundholm <ari@tuxera.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--include/libbb.h1
-rw-r--r--libbb/xatonum.c4
2 files changed, 4 insertions, 1 deletions
diff --git a/include/libbb.h b/include/libbb.h
index 9550c05..26b6868 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -863,6 +863,7 @@ struct suffix_mult {
extern const struct suffix_mult bkm_suffixes[];
#define km_suffixes (bkm_suffixes + 1)
extern const struct suffix_mult cwbkMG_suffixes[];
+#define kMG_suffixes (cwbkMG_suffixes + 3)
#include "xatonum.h"
/* Specialized: */
diff --git a/libbb/xatonum.c b/libbb/xatonum.c
index 19b54fb..9dd5c3e 100644
--- a/libbb/xatonum.c
+++ b/libbb/xatonum.c
@@ -83,7 +83,9 @@ const struct suffix_mult cwbkMG_suffixes[] = {
{ "kB", 1000 },
{ "kD", 1000 },
{ "k", 1024 },
- { "K", 1024 }, /* compat with coreutils dd (it also accepts KB and KD, TODO?) */
+ { "KB", 1000 }, /* compat with coreutils dd */
+ { "KD", 1000 }, /* compat with coreutils dd */
+ { "K", 1024 }, /* compat with coreutils dd */
{ "MB", 1000000 },
{ "MD", 1000000 },
{ "M", 1024*1024 },