diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2018-04-07 15:21:35 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2018-04-07 15:23:10 +0200 |
| commit | bae8fc4436f9aeb43ef0aaccd1c9b1b35b5a4617 (patch) | |
| tree | 454dbb6414c851c9ce0d6fe478ca86cf5cf4fa1b /findutils | |
| parent | 77cb6b99a436c20bb171e6cdad7b8b8b5ce3692c (diff) | |
| download | busybox-w32-bae8fc4436f9aeb43ef0aaccd1c9b1b35b5a4617.tar.gz busybox-w32-bae8fc4436f9aeb43ef0aaccd1c9b1b35b5a4617.tar.bz2 busybox-w32-bae8fc4436f9aeb43ef0aaccd1c9b1b35b5a4617.zip | |
xargs: use bb_ask_y_confirmation_FILE() instead of homegrown copy
function old new delta
bb_ask_y_confirmation_FILE - 83 +83
inetd_main 2033 2043 +10
udhcp_send_kernel_packet 295 301 +6
rmescapes 306 310 +4
send_tree 353 355 +2
i2cdetect_main 674 672 -2
confirm_or_abort 43 38 -5
get_terminal_width_height 242 234 -8
bb_ask_y_confirmation 76 10 -66
xargs_main 823 755 -68
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 4/5 up/down: 105/-149) Total: -44 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'findutils')
| -rw-r--r-- | findutils/xargs.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/findutils/xargs.c b/findutils/xargs.c index 117a39b62..1d85d50e8 100644 --- a/findutils/xargs.c +++ b/findutils/xargs.c | |||
| @@ -496,16 +496,16 @@ static char* FAST_FUNC process_stdin_with_replace(int n_max_chars, int n_max_arg | |||
| 496 | static int xargs_ask_confirmation(void) | 496 | static int xargs_ask_confirmation(void) |
| 497 | { | 497 | { |
| 498 | FILE *tty_stream; | 498 | FILE *tty_stream; |
| 499 | int c, savec; | 499 | int r; |
| 500 | 500 | ||
| 501 | tty_stream = xfopen_for_read(CURRENT_TTY); | 501 | tty_stream = xfopen_for_read(CURRENT_TTY); |
| 502 | |||
| 502 | fputs(" ?...", stderr); | 503 | fputs(" ?...", stderr); |
| 503 | fflush_all(); | 504 | r = bb_ask_y_confirmation_FILE(tty_stream); |
| 504 | c = savec = getc(tty_stream); | 505 | |
| 505 | while (c != EOF && c != '\n') | ||
| 506 | c = getc(tty_stream); | ||
| 507 | fclose(tty_stream); | 506 | fclose(tty_stream); |
| 508 | return (savec == 'y' || savec == 'Y'); | 507 | |
| 508 | return r; | ||
| 509 | } | 509 | } |
| 510 | #else | 510 | #else |
| 511 | # define xargs_ask_confirmation() 1 | 511 | # define xargs_ask_confirmation() 1 |