emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xargs: use bb_ask_y_confirmation_FILE() instead of homegrown copy

Browse Source 
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>
This commit is contained in:
Denys Vlasenko
2018-04-07 15:21:35 +02:00
parent 77cb6b99a4
commit bae8fc4436
5 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
findutils/xargs.c
View File

@@ -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