diff options
author | Ari Sundholm <ari@tuxera.com> | 2015-03-22 17:55:38 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2015-03-22 17:56:38 +0100 |
commit | 911db16229d41f53b9c44272fcccdb3552a5a99e (patch) | |
tree | 61085234d4d581f6adab360171508470c1074f92 | |
parent | 8893023ba27ea87b12a333960271c9f86cdebf7b (diff) | |
download | busybox-w32-911db16229d41f53b9c44272fcccdb3552a5a99e.tar.gz busybox-w32-911db16229d41f53b9c44272fcccdb3552a5a99e.tar.bz2 busybox-w32-911db16229d41f53b9c44272fcccdb3552a5a99e.zip |
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.h | 1 | ||||
-rw-r--r-- | libbb/xatonum.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/libbb.h b/include/libbb.h index 9550c0589..26b686805 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
@@ -863,6 +863,7 @@ struct suffix_mult { | |||
863 | extern const struct suffix_mult bkm_suffixes[]; | 863 | extern const struct suffix_mult bkm_suffixes[]; |
864 | #define km_suffixes (bkm_suffixes + 1) | 864 | #define km_suffixes (bkm_suffixes + 1) |
865 | extern const struct suffix_mult cwbkMG_suffixes[]; | 865 | extern const struct suffix_mult cwbkMG_suffixes[]; |
866 | #define kMG_suffixes (cwbkMG_suffixes + 3) | ||
866 | 867 | ||
867 | #include "xatonum.h" | 868 | #include "xatonum.h" |
868 | /* Specialized: */ | 869 | /* Specialized: */ |
diff --git a/libbb/xatonum.c b/libbb/xatonum.c index 19b54fb0c..9dd5c3e7e 100644 --- a/libbb/xatonum.c +++ b/libbb/xatonum.c | |||
@@ -83,7 +83,9 @@ const struct suffix_mult cwbkMG_suffixes[] = { | |||
83 | { "kB", 1000 }, | 83 | { "kB", 1000 }, |
84 | { "kD", 1000 }, | 84 | { "kD", 1000 }, |
85 | { "k", 1024 }, | 85 | { "k", 1024 }, |
86 | { "K", 1024 }, /* compat with coreutils dd (it also accepts KB and KD, TODO?) */ | 86 | { "KB", 1000 }, /* compat with coreutils dd */ |
87 | { "KD", 1000 }, /* compat with coreutils dd */ | ||
88 | { "K", 1024 }, /* compat with coreutils dd */ | ||
87 | { "MB", 1000000 }, | 89 | { "MB", 1000000 }, |
88 | { "MD", 1000000 }, | 90 | { "MD", 1000000 }, |
89 | { "M", 1024*1024 }, | 91 | { "M", 1024*1024 }, |