remove trailing blanks

[gnulib.git] / lib / yesno.c

diff --git a/lib/yesno.c b/lib/yesno.c
index f69954d..54691b7 100644 (file)
--- a/lib/yesno.c
+++ b/lib/yesno.c
@@ -1,5 +1,5 @@
 /* yesno.c -- read a yes/no response from stdin
-   Copyright (C) 1990 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1998, 2001, 2003, 2004 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
@@ -15,23 +15,28 @@
    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>
+#if HAVE_CONFIG_H
+# include <config.h>
 #endif
 
+#include "yesno.h"
+
 #include <ctype.h>
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
 #include <stdio.h>
 
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
+
 /* Read one line from standard input
    and return nonzero if that line begins with y or Y,
    otherwise return 0. */
 
-#ifdef HAVE_RPMATCH
-int
-yesno ()
+extern int rpmatch (char const *response);
+
+bool
+yesno (void)
 {
   /* We make some assumptions here:
      a) leading white space in the response are not vital
@@ -49,19 +54,3 @@ yesno ()
 
   return rpmatch (buf) == 1;
 }
-#else
-int
-yesno ()
-{
-  int c;
-  int rv;
-
-  fflush (stderr);
-  c = getchar ();
-  rv = (c == 'y') || (c == 'Y');
-  while (c != EOF && c != '\n')
-    c = getchar ();
-
-  return rv;
-}
-#endif