Bump to version 1.22.1

[platform/upstream/busybox.git] / libbb / ask_confirmation.c

diff --git a/libbb/ask_confirmation.c b/libbb/ask_confirmation.c
index a99a4e7..d95729c 100644 (file)
--- a/libbb/ask_confirmation.c
+++ b/libbb/ask_confirmation.c
@@ -4,46 +4,24 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 /* Read a line from stdin.  If the first non-whitespace char is 'y' or 'Y',
  * return 1.  Otherwise return 0.
  */
-
-#include <stdio.h>
-#include <ctype.h>
 #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';
 }