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/tail.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/tail.c')
-rw-r--r-- | coreutils/tail.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/coreutils/tail.c b/coreutils/tail.c index 340697f88..52aa8f69e 100644 --- a/coreutils/tail.c +++ b/coreutils/tail.c | |||
@@ -101,16 +101,12 @@ int tail_main(int argc, char **argv) | |||
101 | 101 | ||
102 | #if ENABLE_INCLUDE_SUSv2 || ENABLE_FEATURE_FANCY_TAIL | 102 | #if ENABLE_INCLUDE_SUSv2 || ENABLE_FEATURE_FANCY_TAIL |
103 | /* Allow legacy syntax of an initial numeric option without -n. */ | 103 | /* Allow legacy syntax of an initial numeric option without -n. */ |
104 | if (argc >= 2 && (argv[1][0] == '+' || argv[1][0] == '-') | 104 | if (argv[1] && (argv[1][0] == '+' || argv[1][0] == '-') |
105 | && isdigit(argv[1][1]) | 105 | && isdigit(argv[1][1]) |
106 | ) { | 106 | ) { |
107 | /* replacing arg[0] with "-n" can segfault, so... */ | 107 | count = eat_num(&argv[1][1]); |
108 | argv[1] = xasprintf("-n%s", argv[1]); | 108 | argv++; |
109 | #if 0 /* If we ever decide to make tail NOFORK */ | 109 | argc--; |
110 | char *s = alloca(strlen(argv[1]) + 3); | ||
111 | sprintf(s, "-n%s", argv[1]); | ||
112 | argv[1] = s; | ||
113 | #endif | ||
114 | } | 110 | } |
115 | #endif | 111 | #endif |
116 | 112 | ||
@@ -133,8 +129,7 @@ int tail_main(int argc, char **argv) | |||
133 | 129 | ||
134 | /* open all the files */ | 130 | /* open all the files */ |
135 | fds = xmalloc(sizeof(int) * (argc + 1)); | 131 | fds = xmalloc(sizeof(int) * (argc + 1)); |
136 | nfiles = i = 0; | 132 | if (!argv[0]) { |
137 | if (argc == 0) { | ||
138 | struct stat statbuf; | 133 | struct stat statbuf; |
139 | 134 | ||
140 | if (!fstat(STDIN_FILENO, &statbuf) && S_ISFIFO(statbuf.st_mode)) { | 135 | if (!fstat(STDIN_FILENO, &statbuf) && S_ISFIFO(statbuf.st_mode)) { |
@@ -142,13 +137,14 @@ int tail_main(int argc, char **argv) | |||
142 | } | 137 | } |
143 | *argv = (char *) bb_msg_standard_input; | 138 | *argv = (char *) bb_msg_standard_input; |
144 | } | 139 | } |
140 | nfiles = i = 0; | ||
145 | do { | 141 | do { |
146 | FILE* fil = fopen_or_warn_stdin(argv[i]); | 142 | int fd = open_or_warn_stdin(argv[i]); |
147 | if (!fil) { | 143 | if (fd < 0) { |
148 | G.status = EXIT_FAILURE; | 144 | G.status = EXIT_FAILURE; |
149 | continue; | 145 | continue; |
150 | } | 146 | } |
151 | fds[nfiles] = fileno(fil); | 147 | fds[nfiles] = fd; |
152 | argv[nfiles++] = argv[i]; | 148 | argv[nfiles++] = argv[i]; |
153 | } while (++i < argc); | 149 | } while (++i < argc); |
154 | 150 | ||