diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-21 23:05:26 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-21 23:05:26 +0000 |
| commit | 5415c856eaccd1bc5d064022770a288f43b2e94f (patch) | |
| tree | 5973db4e6f81b5e311e8944700ded5db1083d440 /findutils | |
| parent | b74a2dba571d1c5a6127c683fb50923336d9c59f (diff) | |
| download | busybox-w32-5415c856eaccd1bc5d064022770a288f43b2e94f.tar.gz busybox-w32-5415c856eaccd1bc5d064022770a288f43b2e94f.tar.bz2 busybox-w32-5415c856eaccd1bc5d064022770a288f43b2e94f.zip | |
libbb: [x]fopen_for_{read,write} introduced and used.
(by Valdimir)
function old new delta
config_open2 - 41 +41
config_read 507 542 +35
find_pair 169 187 +18
fopen_for_write - 14 +14
fopen_for_read - 14 +14
find_main 406 418 +12
xfopen_for_write - 10 +10
xfopen_for_read - 10 +10
popstring 134 140 +6
parse_inittab 396 401 +5
next_token 923 928 +5
pack_gzip 1659 1661 +2
bb__parsespent 117 119 +2
fallbackSort 1719 1717 -2
evalvar 1376 1374 -2
qrealloc 36 33 -3
...
...
...
...
singlemount 4579 4569 -10
process_stdin 443 433 -10
patch_main 1111 1101 -10
ifupdown_main 2175 2165 -10
file_action_grep 90 80 -10
uuidcache_init 649 637 -12
hush_main 797 785 -12
read_config 230 217 -13
dpkg_main 3835 3820 -15
read_line_input 3134 3110 -24
sysctl_main 232 203 -29
config_open 40 10 -30
WARN_BAD_LINE 44 - -44
login_main 1714 1575 -139
------------------------------------------------------------------------------
(add/remove: 5/1 grow/shrink: 8/74 up/down: 174/-737) Total: -563 bytes
Diffstat (limited to 'findutils')
| -rw-r--r-- | findutils/grep.c | 4 | ||||
| -rw-r--r-- | findutils/xargs.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/findutils/grep.c b/findutils/grep.c index 5cfd7721f..030e62461 100644 --- a/findutils/grep.c +++ b/findutils/grep.c | |||
| @@ -375,7 +375,7 @@ static int FAST_FUNC file_action_grep(const char *filename, | |||
| 375 | void* matched, | 375 | void* matched, |
| 376 | int depth UNUSED_PARAM) | 376 | int depth UNUSED_PARAM) |
| 377 | { | 377 | { |
| 378 | FILE *file = fopen(filename, "r"); | 378 | FILE *file = fopen_for_read(filename); |
| 379 | if (file == NULL) { | 379 | if (file == NULL) { |
| 380 | if (!SUPPRESS_ERR_MSGS) | 380 | if (!SUPPRESS_ERR_MSGS) |
| 381 | bb_simple_perror_msg(filename); | 381 | bb_simple_perror_msg(filename); |
| @@ -514,7 +514,7 @@ int grep_main(int argc, char **argv) | |||
| 514 | } | 514 | } |
| 515 | } | 515 | } |
| 516 | /* else: fopen(dir) will succeed, but reading won't */ | 516 | /* else: fopen(dir) will succeed, but reading won't */ |
| 517 | file = fopen(cur_file, "r"); | 517 | file = fopen_for_read(cur_file); |
| 518 | if (file == NULL) { | 518 | if (file == NULL) { |
| 519 | if (!SUPPRESS_ERR_MSGS) | 519 | if (!SUPPRESS_ERR_MSGS) |
| 520 | bb_simple_perror_msg(cur_file); | 520 | bb_simple_perror_msg(cur_file); |
diff --git a/findutils/xargs.c b/findutils/xargs.c index 7a9865b5e..8f0a3d4ad 100644 --- a/findutils/xargs.c +++ b/findutils/xargs.c | |||
| @@ -277,7 +277,7 @@ static int xargs_ask_confirmation(void) | |||
| 277 | FILE *tty_stream; | 277 | FILE *tty_stream; |
| 278 | int c, savec; | 278 | int c, savec; |
| 279 | 279 | ||
| 280 | tty_stream = xfopen(CURRENT_TTY, "r"); | 280 | tty_stream = xfopen_for_read(CURRENT_TTY); |
| 281 | fputs(" ?...", stderr); | 281 | fputs(" ?...", stderr); |
| 282 | fflush(stderr); | 282 | fflush(stderr); |
| 283 | c = savec = getc(tty_stream); | 283 | c = savec = getc(tty_stream); |