diff options
Diffstat (limited to 'libbb/ask_confirmation.c')
-rw-r--r-- | libbb/ask_confirmation.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/libbb/ask_confirmation.c b/libbb/ask_confirmation.c index 6fbed89f4..e4814e215 100644 --- a/libbb/ask_confirmation.c +++ b/libbb/ask_confirmation.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* vi: set sw=4 ts=4: */ | 1 | /* vi: set sw=4 ts=4: */ |
2 | /* | 2 | /* |
3 | * bb_ask_confirmation implementation for busybox | 3 | * bb_ask_y_confirmation implementation for busybox |
4 | * | 4 | * |
5 | * Copyright (C) 2003 Manuel Novoa III <mjn3@codepoet.org> | 5 | * Copyright (C) 2003 Manuel Novoa III <mjn3@codepoet.org> |
6 | * | 6 | * |
@@ -8,15 +8,16 @@ | |||
8 | */ | 8 | */ |
9 | #include "libbb.h" | 9 | #include "libbb.h" |
10 | 10 | ||
11 | /* Read a line from stdin. If the first non-whitespace char is 'y' or 'Y', | 11 | /* Read a line from fp. If the first non-whitespace char is 'y' or 'Y', |
12 | * return 1. Otherwise return 0. | 12 | * return 1. Otherwise return 0. |
13 | */ | 13 | */ |
14 | int FAST_FUNC bb_ask_confirmation(void) | 14 | int FAST_FUNC bb_ask_y_confirmation_FILE(FILE *fp) |
15 | { | 15 | { |
16 | char first = 0; | 16 | char first = 0; |
17 | int c; | 17 | int c; |
18 | 18 | ||
19 | while (((c = getchar()) != EOF) && (c != '\n')) { | 19 | fflush_all(); |
20 | while (((c = fgetc(fp)) != EOF) && (c != '\n')) { | ||
20 | if (first == 0 && !isblank(c)) { | 21 | if (first == 0 && !isblank(c)) { |
21 | first = c|0x20; | 22 | first = c|0x20; |
22 | } | 23 | } |
@@ -24,3 +25,8 @@ int FAST_FUNC bb_ask_confirmation(void) | |||
24 | 25 | ||
25 | return first == 'y'; | 26 | return first == 'y'; |
26 | } | 27 | } |
28 | |||
29 | int FAST_FUNC bb_ask_y_confirmation(void) | ||
30 | { | ||
31 | return bb_ask_y_confirmation_FILE(stdin); | ||
32 | } | ||