projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New module 'vfprintf-posix'.
[gnulib.git]
/
lib
/
rpmatch.c
diff --git
a/lib/rpmatch.c
b/lib/rpmatch.c
index
a57a047
..
e5f79f8
100644
(file)
--- a/
lib/rpmatch.c
+++ b/
lib/rpmatch.c
@@
-1,43
+1,38
@@
-/* 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.
-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.
+ Copyright (C) 1996, 1998, 2000, 2002, 2003, 2006 Free Software
+ Foundation, Inc.
-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 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
.
-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. */
+ 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.
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#if STDC_HEADERS || _LIBC
-# include <stdlib.h>
-#endif
+#include <config.h>
-#include <regex.h>
+#include <stddef.h>
+#include <stdlib.h>
-#ifndef _
-# define _(String) String
-#endif
+#if ENABLE_NLS
+# include <sys/types.h>
+# include <limits.h>
+# include <regex.h>
+# include "gettext.h"
+# define _(msgid) gettext (msgid)
static int
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)
{
{
if (pattern != *lastp)
{
@@
-57,12
+52,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;
}
/* See if the regular expression matches RESPONSE. */
return regexec (re, response, 0, NULL, 0) == 0 ? match : nomatch;
}
+#endif
int
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. */
/* Match against one of the response patterns, compiling the pattern
first if necessary. */
@@
-75,4
+71,9
@@
rpmatch (response)
&yesexpr, &yesre))
? result
: try (response, _("^[nN]"), 0, -1, &noexpr, &nore));
&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
}
}