X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fyesno.c;h=24006281f0026fa412d39bd674a4228a6c2b7154;hb=d90792110b23736fb629c7f3ee150d917e8e9e3a;hp=e4b945838ebc247aebb40616f0842b257f46d56c;hpb=6ef9a07334fff72a0f4ae8e548c303fdcc27eee8;p=gnulib.git

diff --git a/lib/yesno.c b/lib/yesno.c
index e4b945838..24006281f 100644
--- a/lib/yesno.c
+++ b/lib/yesno.c
@@ -1,7 +1,7 @@
 /* yesno.c -- read a yes/no response from stdin
 
-   Copyright (C) 1990, 1998, 2001, 2003, 2004, 2005 Free Software
-   Foundation, Inc.
+   Copyright (C) 1990, 1998, 2001, 2003, 2004, 2005, 2006 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
@@ -17,16 +17,16 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "yesno.h"
 
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "getline.h"
+#if ENABLE_NLS
+# include "getline.h"
+#endif
 
 /* Return true if we read an affirmative line from standard input.  */
 
@@ -35,10 +35,12 @@ extern int rpmatch (char const *response);
 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;
@@ -49,5 +51,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;
 }