diff options
Diffstat (limited to 'libbb/remove_file.c')
| -rw-r--r-- | libbb/remove_file.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libbb/remove_file.c b/libbb/remove_file.c index 8a1324393..86c9a5c56 100644 --- a/libbb/remove_file.c +++ b/libbb/remove_file.c | |||
| @@ -39,9 +39,9 @@ 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_confirmation()) | 44 | if (!bb_ask_y_confirmation()) |
| 45 | return 0; | 45 | return 0; |
| 46 | } | 46 | } |
| 47 | 47 | ||
| @@ -67,8 +67,9 @@ 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 | if (!bb_ask_confirmation()) | 71 | applet_name, path); |
| 72 | if (!bb_ask_y_confirmation()) | ||
| 72 | return status; | 73 | return status; |
| 73 | } | 74 | } |
| 74 | 75 | ||
| @@ -92,7 +93,7 @@ int FAST_FUNC remove_file(const char *path, int flags) | |||
| 92 | || (flags & FILEUTILS_INTERACTIVE) | 93 | || (flags & FILEUTILS_INTERACTIVE) |
| 93 | ) { | 94 | ) { |
| 94 | fprintf(stderr, "%s: remove '%s'? ", applet_name, path); | 95 | fprintf(stderr, "%s: remove '%s'? ", applet_name, path); |
| 95 | if (!bb_ask_confirmation()) | 96 | if (!bb_ask_y_confirmation()) |
| 96 | return 0; | 97 | return 0; |
| 97 | } | 98 | } |
| 98 | 99 | ||