X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fyesno.c;h=3797679177bf13ed5c87e6ed62a355844b2da8aa;hb=930b85b8881f5a65e5b99b75e7341a01ddc2c766;hp=2a6696cd6d1e4d15752636a1fd2e106ea438c3a3;hpb=40d66dc7f516cb90c73438c46663bf8454ee0760;p=gnulib.git
diff --git a/lib/yesno.c b/lib/yesno.c
index 2a6696cd6..379767917 100644
--- a/lib/yesno.c
+++ b/lib/yesno.c
@@ -1,10 +1,11 @@
/* yesno.c -- read a yes/no response from stdin
- Copyright (C) 1990, 1998, 2001, 2003 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 1990, 1998, 2001, 2003-2013 Free Software Foundation, Inc.
+
+ 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
@@ -12,40 +13,48 @@
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. */
+ along with this program. If not, see . */
-#if HAVE_CONFIG_H
-# include
-#endif
+#include
+
+#include "yesno.h"
-#include
#include
#include
-#include "unlocked-io.h"
-/* Read one line from standard input
- and return nonzero if that line begins with y or Y,
- otherwise return 0. */
+/* 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(). */
-int
-yesno ()
+bool
+yesno (void)
{
- /* We make some assumptions here:
- a) leading white space in the response are not vital
- b) the first 128 characters of the answer are enough (the rest can
- be ignored)
- I cannot think for a situation where this is not ok. --drepper@gnu */
- char buf[128];
- int len = 0;
- int c;
-
- while ((c = getchar ()) != EOF && c != '\n')
- if ((len > 0 && len < 127) || (len == 0 && !isspace (c)))
- buf[len++] = c;
- buf[len] = '\0';
-
- return rpmatch (buf) == 1;
+ bool yes;
+
+#if ENABLE_NLS
+ char *response = NULL;
+ size_t response_size = 0;
+ ssize_t response_len = getline (&response, &response_size, stdin);
+
+ if (response_len <= 0)
+ yes = false;
+ else
+ {
+ response[response_len - 1] = '\0';
+ yes = (0 < rpmatch (response));
+ }
+
+ 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;
}