diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-17 09:07:36 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-17 09:07:36 +0000 |
commit | 62a90cdd7435f09f4bb8673e8b7b213067f9d5cc (patch) | |
tree | ac7f86c4de0ce0c095b59820c7ba238369c65f71 /miscutils | |
parent | d02db892440499a072ea8c83c2370e9d9c103098 (diff) | |
download | busybox-w32-62a90cdd7435f09f4bb8673e8b7b213067f9d5cc.tar.gz busybox-w32-62a90cdd7435f09f4bb8673e8b7b213067f9d5cc.tar.bz2 busybox-w32-62a90cdd7435f09f4bb8673e8b7b213067f9d5cc.zip |
*: shrink by using [f]open_or_warn_stdin where appropriate
function old new delta
lsattr_main 62 143 +81
open_or_warn_stdin - 36 +36
fclose_if_not_stdin 20 47 +27
xfopen_stdin - 20 +20
tac_main 336 356 +20
cksum_main 249 259 +10
bb_argv_dash - 8 +8
su_main 448 455 +7
cmp_main 630 633 +3
passwd_main 1072 1074 +2
uudecode_main 317 315 -2
text_yank 110 108 -2
handle_incoming_and_exit 2653 2651 -2
flags 5 1 -4
write_leases 235 230 -5
fopen_or_warn_stdin 48 42 -6
fold_main 648 642 -6
static.argv_dash 8 - -8
sum_main 142 128 -14
tail_main 1237 1221 -16
sed_main 711 695 -16
cmp_xfopen_input 17 - -17
bb_cat 113 96 -17
catv_main 328 306 -22
strings_main 457 434 -23
hash_file 298 274 -24
sum_file 353 325 -28
sort_main 904 859 -45
expand_main 736 686 -50
cut_main 1116 1065 -51
md5_sha1_sum_main 549 493 -56
lsattr_args 90 - -90
read_stduu 408 255 -153
------------------------------------------------------------------------------
(add/remove: 3/3 grow/shrink: 7/20 up/down: 214/-657) Total: -443 bytes
text data bss dec hex filename
797417 658 7428 805503 c4a7f busybox_old
796973 658 7428 805059 c48c3 busybox_unstripped
Diffstat (limited to 'miscutils')
-rw-r--r-- | miscutils/strings.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/miscutils/strings.c b/miscutils/strings.c index 57a2c0a17..5efbabf6f 100644 --- a/miscutils/strings.c +++ b/miscutils/strings.c | |||
@@ -23,7 +23,7 @@ int strings_main(int argc ATTRIBUTE_UNUSED, char **argv) | |||
23 | unsigned opt; | 23 | unsigned opt; |
24 | unsigned count; | 24 | unsigned count; |
25 | off_t offset; | 25 | off_t offset; |
26 | FILE *file = stdin; | 26 | FILE *file; |
27 | char *string; | 27 | char *string; |
28 | const char *fmt = "%s: "; | 28 | const char *fmt = "%s: "; |
29 | const char *n_arg = "4"; | 29 | const char *n_arg = "4"; |
@@ -40,16 +40,14 @@ int strings_main(int argc ATTRIBUTE_UNUSED, char **argv) | |||
40 | if (!*argv) { | 40 | if (!*argv) { |
41 | fmt = "{%s}: "; | 41 | fmt = "{%s}: "; |
42 | *--argv = (char *)bb_msg_standard_input; | 42 | *--argv = (char *)bb_msg_standard_input; |
43 | goto PIPE; | ||
44 | } | 43 | } |
45 | 44 | ||
46 | do { | 45 | do { |
47 | file = fopen_or_warn(*argv, "r"); | 46 | file = fopen_or_warn_stdin(*argv); |
48 | if (!file) { | 47 | if (!file) { |
49 | status = EXIT_FAILURE; | 48 | status = EXIT_FAILURE; |
50 | continue; | 49 | continue; |
51 | } | 50 | } |
52 | PIPE: | ||
53 | offset = 0; | 51 | offset = 0; |
54 | count = 0; | 52 | count = 0; |
55 | do { | 53 | do { |