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 /libbb/remove_file.c | |
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 'libbb/remove_file.c')
-rw-r--r-- | libbb/remove_file.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libbb/remove_file.c b/libbb/remove_file.c index 074ffae70..86c9a5c56 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) | |||
39 | if ((!(flags & FILEUTILS_FORCE) && access(path, W_OK) < 0 && isatty(0)) | 39 | if ((!(flags & FILEUTILS_FORCE) && access(path, W_OK) < 0 && isatty(0)) |
40 | || (flags & FILEUTILS_INTERACTIVE) | 40 | || (flags & FILEUTILS_INTERACTIVE) |
41 | ) { | 41 | ) { |
42 | fprintf(stderr, "%s: descend into directory '%s'? ", applet_name, | 42 | fprintf(stderr, "%s: descend into directory '%s'? ", |
43 | path); | 43 | applet_name, path); |
44 | if (!bb_ask_y_confirmation()) | 44 | if (!bb_ask_y_confirmation()) |
45 | return 0; | 45 | return 0; |
46 | } | 46 | } |
@@ -67,7 +67,8 @@ int FAST_FUNC remove_file(const char *path, int flags) | |||
67 | } | 67 | } |
68 | 68 | ||
69 | if (flags & FILEUTILS_INTERACTIVE) { | 69 | if (flags & FILEUTILS_INTERACTIVE) { |
70 | fprintf(stderr, "%s: remove directory '%s'? ", applet_name, path); | 70 | fprintf(stderr, "%s: remove directory '%s'? ", |
71 | applet_name, path); | ||
71 | if (!bb_ask_y_confirmation()) | 72 | if (!bb_ask_y_confirmation()) |
72 | return status; | 73 | return status; |
73 | } | 74 | } |