From bae8fc4436f9aeb43ef0aaccd1c9b1b35b5a4617 Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Sat, 7 Apr 2018 15:21:35 +0200
Subject: 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>
---
findutils/xargs.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
(limited to 'findutils')
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
static int xargs_ask_confirmation(void)
{
FILE *tty_stream;
- int c, savec;
+ int r;
tty_stream = xfopen_for_read(CURRENT_TTY);
+
fputs(" ?...", stderr);
- fflush_all();
- c = savec = getc(tty_stream);
- while (c != EOF && c != '\n')
- c = getc(tty_stream);
+ r = bb_ask_y_confirmation_FILE(tty_stream);
+
fclose(tty_stream);
- return (savec == 'y' || savec == 'Y');
+
+ return r;
}
#else
# define xargs_ask_confirmation() 1
--
cgit v1.2.3