X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Frpmatch.c;h=bdbff6d7c79003e8b72ffe346c2b38166ac990af;hb=1cc4ba44c23782d32d4d2986b355e336f5e21335;hp=eeda0fd60df484aac3a4a7c39cef6e9643a116d4;hpb=f646bc46feb34b2439efbff774108cbbe3031dd1;p=gnulib.git

diff --git a/lib/rpmatch.c b/lib/rpmatch.c
index eeda0fd60..bdbff6d7c 100644
--- a/lib/rpmatch.c
+++ b/lib/rpmatch.c
@@ -1,30 +1,40 @@
-/* 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 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
 
 #if STDC_HEADERS || _LIBC
+# include <stddef.h>
 # include <stdlib.h>
+#else
+# ifndef NULL
+#  define NULL 0
+# endif
 #endif
 
-#include <regex.h>
+#include <sys/types.h>
+#if WITH_REGEX
+# include <regex.h>
+#else
+# include <rx.h>
+#endif
 
 #if ENABLE_NLS
 # include <libintl.h>
@@ -74,8 +84,8 @@ rpmatch (response)
   static regex_t yesre, nore;
   int result;
 
-  return ((result = try (response, _("^[yY][[:alpha:]]*"), 1, 0,
+  return ((result = try (response, _("^[yY]"), 1, 0,
 			 &yesexpr, &yesre))
 	  ? result
-	  : try (response, _("^[nN][[:alpha:]]*"), 0, -1, &noexpr, &nore));
+	  : try (response, _("^[nN]"), 0, -1, &noexpr, &nore));
 }