X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Frpmatch.c;h=3a439d7e318153128b311912c2850d83f16f3877;hb=refs%2Ftags%2FFILEUTILS-3_16x;hp=b3fd4a0916da85d13195d67972cfab32275075c6;hpb=1af5084bdf3b123a2e49ad302d5c8d9bcd6bad3a;p=gnulib.git

diff --git a/lib/rpmatch.c b/lib/rpmatch.c
index b3fd4a091..3a439d7e3 100644
--- a/lib/rpmatch.c
+++ b/lib/rpmatch.c
@@ -1,31 +1,47 @@
-/* rpmatch - determine whether string value is affirmation or negative
-	     response according to current locale's data
-Copyright (C) 1996 Free Software Foundation, Inc.
+/* Determine whether string value is affirmation or negative response
+   according to current locale's data.
+   Copyright (C) 1996, 1998 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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+   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
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#ifdef HAVE_CONFIG_H
+#if HAVE_CONFIG_H
 # include <config.h>
 #endif
 
-#include <stdlib.h>
+#if STDC_HEADERS || _LIBC
+# include <stddef.h>
+# include <stdlib.h>
+#else
+# ifndef NULL
+#  define NULL 0
+# endif
+#endif
+
+#include <sys/types.h>
 #include <regex.h>
 
+#if ENABLE_NLS
+# include <libintl.h>
+# define _(Text) gettext (Text)
+#else
+# define _(Text) Text
+#endif
 
 static int
-try (tag, match, nomatch, lastp, re)
+try (response, pattern, match, nomatch, lastp, re)
+     const char *response;
      const char *pattern;
      const int match;
      const int nomatch;
@@ -47,7 +63,7 @@ try (tag, match, nomatch, lastp, re)
       *lastp = pattern;
     }
 
-  /* Try the pattern.  */
+  /* See if the regular expression matches RESPONSE.  */
   return regexec (re, response, 0, NULL, 0) == 0 ? match : nomatch;
 }
 
@@ -64,7 +80,8 @@ rpmatch (response)
   static regex_t yesre, nore;
   int result;
 
-  return ((result = try (_("[yY][[:alpha:]]"), 1, 0, &yesexpr, &yesre))
+  return ((result = try (response, _("^[yY]"), 1, 0,
+			 &yesexpr, &yesre))
 	  ? result
-	  : try (_("[nN][[:alpha:]]"), 0, -1, &noexpr, &nore));
+	  : try (response, _("^[nN]"), 0, -1, &noexpr, &nore));
 }