diff options
| author | Denys Vlasenko | 2018-04-07 15:21:35 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2018-04-07 15:23:10 +0200 |
| commit | bae8fc4436f9aeb43ef0aaccd1c9b1b35b5a4617 (patch) | |
| tree | 454dbb6414c851c9ce0d6fe478ca86cf5cf4fa1b /libbb | |
| parent | 77cb6b99a436c20bb171e6cdad7b8b8b5ce3692c (diff) | |
| download | busybox-bae8fc4436f9aeb43ef0aaccd1c9b1b35b5a4617.zip busybox-bae8fc4436f9aeb43ef0aaccd1c9b1b35b5a4617.tar.gz | |
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 'libbb')
| -rw-r--r-- | libbb/ask_confirmation.c | 12 | ||||
| -rw-r--r-- | libbb/remove_file.c | 7 |
2 files changed, 13 insertions, 6 deletions
diff --git a/libbb/ask_confirmation.c b/libbb/ask_confirmation.c index ccd983c..e4814e2 100644 --- a/libbb/ask_confirmation.c +++ b/libbb/ask_confirmation.c @@ -8,15 +8,16 @@ */ #include "libbb.h" -/* Read a line from stdin. If the first non-whitespace char is 'y' or 'Y', +/* Read a line from fp. If the first non-whitespace char is 'y' or 'Y', * return 1. Otherwise return 0. */ -int FAST_FUNC bb_ask_y_confirmation(void) +int FAST_FUNC bb_ask_y_confirmation_FILE(FILE *fp) { char first = 0; int c; - while (((c = getchar()) != EOF) && (c != '\n')) { + fflush_all(); + while (((c = fgetc(fp)) != EOF) && (c != '\n')) { if (first == 0 && !isblank(c)) { first = c|0x20; } @@ -24,3 +25,8 @@ int FAST_FUNC bb_ask_y_confirmation(void) return first == 'y'; } + +int FAST_FUNC bb_ask_y_confirmation(void) +{ + return bb_ask_y_confirmation_FILE(stdin); +} diff --git a/libbb/remove_file.c b/libbb/remove_file.c index 074ffae..86c9a5c 100644 --- a/libbb/remove_file.c +++ b/libbb/remove_file.c @@ -39,8 +39,8 @@ int FAST_FUNC remove_file(const char *path, int flags) if ((!(flags & FILEUTILS_FORCE) && access(path, W_OK) < 0 && isatty(0)) || (flags & FILEUTILS_INTERACTIVE) ) { - fprintf(stderr, "%s: descend into directory '%s'? ", applet_name, - path); + fprintf(stderr, "%s: descend into directory '%s'? ", + applet_name, path); if (!bb_ask_y_confirmation()) return 0; } @@ -67,7 +67,8 @@ int FAST_FUNC remove_file(const char *path, int flags) } if (flags & FILEUTILS_INTERACTIVE) { - fprintf(stderr, "%s: remove directory '%s'? ", applet_name, path); + fprintf(stderr, "%s: remove directory '%s'? ", + applet_name, path); if (!bb_ask_y_confirmation()) return status; } |