X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Frpmatch.c;h=fbd62e2aff2142f4e3cb2e1e5b9b5e3bdca1ed75;hb=d95dbb37fe04a4f3e608d21e310bcd36a4812584;hp=bf8219514d30e490224a1eb94e8f85980e188a16;hpb=7509c70d1cec14c8977b6a049fd7fec74d2eacb7;p=gnulib.git

diff --git a/lib/rpmatch.c b/lib/rpmatch.c
index bf8219514..fbd62e2af 100644
--- a/lib/rpmatch.c
+++ b/lib/rpmatch.c
@@ -29,26 +29,15 @@
 # endif
 #endif
 
-#include <sys/types.h>
-#if ! HAVE_LIBC_REGEX
-# include <regex.h>
-#endif
-
 #if ENABLE_NLS
+# include <sys/types.h>
+# include <regex.h>
 # include <libintl.h>
 # define _(Text) gettext (Text)
-#else
-# define _(Text) Text
-#endif
 
 static int
-try (response, pattern, match, nomatch, lastp, re)
-     const char *response;
-     const char *pattern;
-     const int match;
-     const int nomatch;
-     const char **lastp;
-     regex_t *re;
+try (const char *response, const char *pattern, const int match,
+     const int nomatch, const char **lastp, regex_t *re)
 {
   if (pattern != *lastp)
     {
@@ -68,12 +57,13 @@ try (response, pattern, match, nomatch, lastp, re)
   /* See if the regular expression matches RESPONSE.  */
   return regexec (re, response, 0, NULL, 0) == 0 ? match : nomatch;
 }
+#endif
 
 
 int
-rpmatch (response)
-     const char *response;
+rpmatch (const char *response)
 {
+#if ENABLE_NLS
   /* Match against one of the response patterns, compiling the pattern
      first if necessary.  */
 
@@ -86,4 +76,9 @@ rpmatch (response)
 			 &yesexpr, &yesre))
 	  ? result
 	  : try (response, _("^[nN]"), 0, -1, &noexpr, &nore));
+#else
+  /* Test against "^[yY]" and "^[nN]", hardcoded to avoid requiring regex */
+  return (*response == 'y' || *response == 'Y' ? 1
+	  : *response == 'n' || *response == 'N' ? 0 : -1);
+#endif
 }