X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fyesno.c;h=65025388bef836fcffa52ad37c18d2ba8fe6739c;hb=5bf4ad0bfa91baa20e4f39f47bfb8b4dd00df720;hp=930bfb0a71f0057d1ff19d69e6c74910411adda9;hpb=0632e115747ff96e93330c88f536d7354a7ce507;p=gnulib.git
diff --git a/lib/yesno.c b/lib/yesno.c
index 930bfb0a7..65025388b 100644
--- a/lib/yesno.c
+++ b/lib/yesno.c
@@ -1,12 +1,11 @@
/* yesno.c -- read a yes/no response from stdin
- Copyright (C) 1990, 1998, 2001, 2003, 2004, 2005, 2006 Free
- Software Foundation, Inc.
+ Copyright (C) 1990, 1998, 2001, 2003-2011 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ 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, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 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
@@ -14,8 +13,7 @@
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
#include
@@ -24,19 +22,21 @@
#include
#include
-#include "getline.h"
+/* Return true if we read an affirmative line from standard input.
-/* Return true if we read an affirmative line from standard input. */
-
-extern int rpmatch (char const *response);
+ Since this function uses stdin, it is suggested that the caller not
+ use STDIN_FILENO directly, and also that the line
+ atexit(close_stdin) be added to main(). */
bool
yesno (void)
{
+ bool yes;
+
+#if ENABLE_NLS
char *response = NULL;
size_t response_size = 0;
ssize_t response_len = getline (&response, &response_size, stdin);
- bool yes;
if (response_len <= 0)
yes = false;
@@ -47,5 +47,14 @@ yesno (void)
}
free (response);
+#else
+ /* Test against "^[yY]", hardcoded to avoid requiring getline,
+ regex, and rpmatch. */
+ int c = getchar ();
+ yes = (c == 'y' || c == 'Y');
+ while (c != '\n' && c != EOF)
+ c = getchar ();
+#endif
+
return yes;
}