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 /coreutils/cut.c | |
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 'coreutils/cut.c')
-rw-r--r-- | coreutils/cut.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/coreutils/cut.c b/coreutils/cut.c index ed6f8f608..e617ef28f 100644 --- a/coreutils/cut.c +++ b/coreutils/cut.c | |||
@@ -205,7 +205,7 @@ int cut_main(int argc ATTRIBUTE_UNUSED, char **argv) | |||
205 | char *ntok; | 205 | char *ntok; |
206 | int s = 0, e = 0; | 206 | int s = 0, e = 0; |
207 | 207 | ||
208 | /* take apart the lists, one by one (they are separated with commas */ | 208 | /* take apart the lists, one by one (they are separated with commas) */ |
209 | while ((ltok = strsep(&sopt, ",")) != NULL) { | 209 | while ((ltok = strsep(&sopt, ",")) != NULL) { |
210 | 210 | ||
211 | /* it's actually legal to pass an empty list */ | 211 | /* it's actually legal to pass an empty list */ |
@@ -258,25 +258,18 @@ int cut_main(int argc ATTRIBUTE_UNUSED, char **argv) | |||
258 | 258 | ||
259 | { | 259 | { |
260 | int retval = EXIT_SUCCESS; | 260 | int retval = EXIT_SUCCESS; |
261 | FILE *file = stdin; | ||
262 | 261 | ||
263 | if (!*argv) { | 262 | if (!*argv) |
264 | argv--; | 263 | *--argv = (char *)"-"; |
265 | goto jump_in; | ||
266 | } | ||
267 | 264 | ||
268 | do { | 265 | do { |
269 | file = stdin; | 266 | FILE *file = fopen_or_warn_stdin(*argv); |
270 | if (NOT_LONE_DASH(*argv)) | ||
271 | file = fopen_or_warn(*argv, "r"); | ||
272 | if (!file) { | 267 | if (!file) { |
273 | retval = EXIT_FAILURE; | 268 | retval = EXIT_FAILURE; |
274 | continue; | 269 | continue; |
275 | } | 270 | } |
276 | jump_in: | ||
277 | cut_file(file, delim); | 271 | cut_file(file, delim); |
278 | if (NOT_LONE_DASH(*argv)) | 272 | fclose_if_not_stdin(file); |
279 | fclose(file); | ||
280 | } while (*++argv); | 273 | } while (*++argv); |
281 | 274 | ||
282 | if (ENABLE_FEATURE_CLEAN_UP) | 275 | if (ENABLE_FEATURE_CLEAN_UP) |