Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/libbb/ask_confirmation.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/libbb/ask_confirmation.c (modified) (2 diffs)

branches/2.2.9/mindi-busybox/libbb/ask_confirmation.c

@@ -5 +5 @@
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
@@ -11 +11 @@
  * return 1.  Otherwise return 0.
  */
-
 #include "libbb.h"
 
-int bb_ask_confirmation(void)
+int FAST_FUNC bb_ask_confirmation(void)
 {
-    int retval = 0;
-    int first = 1;
+    char first = 0;
     int c;
 
     while (((c = getchar()) != EOF) && (c != '\n')) {
-        /* Make sure we get the actual function call for isspace,
-         * as speed is not critical here. */
-        if (first && !(isspace)(c)) {
-            --first;
-            if ((c == 'y') || (c == 'Y')) {
-                ++retval;
-            }
+        if (first == 0 && !isblank(c)) {
+            first = c|0x20;
         }
     }
 
-    return retval;
+    return first == 'y';
 }