* lib/yesno.c [!ENABLE_NLS]: Don't include getline.h.

(yesno) [!ENABLE_NLS]: Don't invoke getline or rpmatch.
This is for the benefit of gzip, which doesn't do i18n.

diff --git a/ChangeLog b/ChangeLog
index 90d5d9cf94a67579a3ff99f735141e2b44d29129..02b9a1ef21604cb68f94c94e7bbf65d6ff342084 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * lib/yesno.c [!ENABLE_NLS]: Don't include getline.h.
+       (yesno) [!ENABLE_NLS]: Don't invoke getline or rpmatch.
+       This is for the benefit of gzip, which doesn't do i18n.
+
 2006-12-12  Jim Meyering  <jim@meyering.net>
 
        * m4/acl.m4 (gl_ACL_GET_FILE): Fix logic error.

diff --git a/lib/yesno.c b/lib/yesno.c
index 930bfb0a71f0057d1ff19d69e6c74910411adda9..24006281f0026fa412d39bd674a4228a6c2b7154 100644 (file)
--- a/lib/yesno.c
+++ b/lib/yesno.c
@@ -24,7 +24,9 @@
 #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.  */
 
@@ -33,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;
@@ -47,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;
 }