X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fyesno.c;h=44c437caf7bb3b7c0e7ae8bb8fa0637595f6f088;hb=40cfe4f7e313e0ac586cc71708cc6d993c9e7a85;hp=a705da732e2d4e7453099de05155f5bd142c66c0;hpb=d87c39464604e74f580c7fae835be31a4c125c36;p=gnulib.git

diff --git a/lib/yesno.c b/lib/yesno.c
index a705da732..44c437caf 100644
--- a/lib/yesno.c
+++ b/lib/yesno.c
@@ -12,26 +12,41 @@
    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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <ctype.h>
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
 #include <stdio.h>
 
 /* Read one line from standard input
    and return nonzero if that line begins with y or Y,
    otherwise return 0. */
 
+int rpmatch ();
+
 int
 yesno ()
 {
+  /* 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;
-  int rv;
 
-  fflush (stderr);
-  c = getchar ();
-  rv = (c == 'y') || (c == 'Y');
-  while (c != EOF && c != '\n')
-    c = getchar ();
+  while ((c = getchar ()) != EOF && c != '\n')
+    if ((len > 0 && len < 127) || (len == 0 && !isspace (c)))
+      buf[len++] = c;
+  buf[len] = '\0';
 
-  return rv;
+  return rpmatch (buf) == 1;
 }