diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-17 09:09:09 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-17 09:09:09 +0000 |
| commit | 1d42665b6b0571b9fa5d3b10fbf2dd03382f0ba2 (patch) | |
| tree | 7ec8969fc2b07a2b7dc37f96435e5eddf7daf7fd /coreutils/du.c | |
| parent | 62a90cdd7435f09f4bb8673e8b7b213067f9d5cc (diff) | |
| download | busybox-w32-1d42665b6b0571b9fa5d3b10fbf2dd03382f0ba2.tar.gz busybox-w32-1d42665b6b0571b9fa5d3b10fbf2dd03382f0ba2.tar.bz2 busybox-w32-1d42665b6b0571b9fa5d3b10fbf2dd03382f0ba2.zip | |
*: shrink: use Vladimir's "o+" specifier instead of xatou(opt_param)
function old new delta
getopt32 1370 1385 +15
sulogin_main 490 494 +4
realpath_main 84 86 +2
sleep_main 76 77 +1
mt_main 256 257 +1
printenv_main 75 74 -1
fdformat_main 546 545 -1
usleep_main 44 42 -2
setlogcons_main 77 75 -2
ed_main 2654 2649 -5
deallocvt_main 69 64 -5
addgroup_main 373 368 -5
mkfs_minix_main 2989 2982 -7
tail_main 1221 1213 -8
sv_main 1254 1241 -13
du_main 348 328 -20
tftp_main 325 302 -23
split_main 581 558 -23
nc_main 1000 977 -23
diff_main 891 868 -23
arping_main 1797 1770 -27
ls_main 893 847 -46
od_main 2797 2750 -47
readprofile_main 1944 1895 -49
tcpudpsvd_main 1973 1922 -51
udhcpc_main 2590 2513 -77
grep_main 824 722 -102
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 5/22 up/down: 23/-560) Total: -537 bytes
text data bss dec hex filename
796973 658 7428 805059 c48c3 busybox_old
796479 662 7420 804561 c46d1 busybox_unstripped
Diffstat (limited to 'coreutils/du.c')
| -rw-r--r-- | coreutils/du.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/coreutils/du.c b/coreutils/du.c index 7495f7a7b..b469824ea 100644 --- a/coreutils/du.c +++ b/coreutils/du.c | |||
| @@ -146,7 +146,6 @@ int du_main(int argc ATTRIBUTE_UNUSED, char **argv) | |||
| 146 | unsigned long total; | 146 | unsigned long total; |
| 147 | int slink_depth_save; | 147 | int slink_depth_save; |
| 148 | bool print_final_total; | 148 | bool print_final_total; |
| 149 | char *smax_print_depth; | ||
| 150 | unsigned opt; | 149 | unsigned opt; |
| 151 | 150 | ||
| 152 | #if ENABLE_FEATURE_HUMAN_READABLE | 151 | #if ENABLE_FEATURE_HUMAN_READABLE |
| @@ -168,8 +167,8 @@ int du_main(int argc ATTRIBUTE_UNUSED, char **argv) | |||
| 168 | * ignore -a. This is consistent with -s being equivalent to -d 0. | 167 | * ignore -a. This is consistent with -s being equivalent to -d 0. |
| 169 | */ | 168 | */ |
| 170 | #if ENABLE_FEATURE_HUMAN_READABLE | 169 | #if ENABLE_FEATURE_HUMAN_READABLE |
| 171 | opt_complementary = "h-km:k-hm:m-hk:H-L:L-H:s-d:d-s"; | 170 | opt_complementary = "h-km:k-hm:m-hk:H-L:L-H:s-d:d-s:d+"; |
| 172 | opt = getopt32(argv, "aHkLsx" "d:" "lc" "hm", &smax_print_depth); | 171 | opt = getopt32(argv, "aHkLsx" "d:" "lc" "hm", &G.max_print_depth); |
| 173 | argv += optind; | 172 | argv += optind; |
| 174 | if (opt & (1 << 9)) { | 173 | if (opt & (1 << 9)) { |
| 175 | /* -h opt */ | 174 | /* -h opt */ |
| @@ -184,8 +183,8 @@ int du_main(int argc ATTRIBUTE_UNUSED, char **argv) | |||
| 184 | G.disp_hr = 1024; | 183 | G.disp_hr = 1024; |
| 185 | } | 184 | } |
| 186 | #else | 185 | #else |
| 187 | opt_complementary = "H-L:L-H:s-d:d-s"; | 186 | opt_complementary = "H-L:L-H:s-d:d-s:d+"; |
| 188 | opt = getopt32(argv, "aHkLsx" "d:" "lc", &smax_print_depth); | 187 | opt = getopt32(argv, "aHkLsx" "d:" "lc", &G.max_print_depth); |
| 189 | argv += optind; | 188 | argv += optind; |
| 190 | #if !ENABLE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K | 189 | #if !ENABLE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K |
| 191 | if (opt & (1 << 2)) { | 190 | if (opt & (1 << 2)) { |
| @@ -211,10 +210,6 @@ int du_main(int argc ATTRIBUTE_UNUSED, char **argv) | |||
| 211 | G.max_print_depth = 0; | 210 | G.max_print_depth = 0; |
| 212 | } | 211 | } |
| 213 | G.one_file_system = opt & (1 << 5); /* -x opt */ | 212 | G.one_file_system = opt & (1 << 5); /* -x opt */ |
| 214 | if (opt & (1 << 6)) { | ||
| 215 | /* -d opt */ | ||
| 216 | G.max_print_depth = xatoi_u(smax_print_depth); | ||
| 217 | } | ||
| 218 | if (opt & (1 << 7)) { | 213 | if (opt & (1 << 7)) { |
| 219 | /* -l opt */ | 214 | /* -l opt */ |
| 220 | G.count_hardlinks = MAXINT(nlink_t); | 215 | G.count_hardlinks = MAXINT(nlink_t); |