projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
'trap' portability trapped me...
[gnulib.git]
/
lib
/
rpmatch.c
diff --git
a/lib/rpmatch.c
b/lib/rpmatch.c
index
9cc5175
..
ba8bc4c
100644
(file)
--- a/
lib/rpmatch.c
+++ b/
lib/rpmatch.c
@@
-1,6
+1,6
@@
/* Determine whether string value is affirmation or negative response
according to current locale's data.
/* Determine whether string value is affirmation or negative response
according to current locale's data.
- Copyright (C) 1996, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1998
, 2000, 2002, 2003
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
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
@@
-14,33
+14,25
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
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., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+ Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA. */
-#if HAVE_CONFIG_H
+#if
def
HAVE_CONFIG_H
# include <config.h>
#endif
# include <config.h>
#endif
-#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>
+#include <stddef.h>
+#include <stdlib.h>
#if ENABLE_NLS
#if ENABLE_NLS
-# include <
libintl
.h>
-#
define _(Text) gettext (Text)
-#
else
-#
define _(Text) Text
-#
endif
+# include <
sys/types
.h>
+#
include <limits.h>
+#
include <regex.h>
+#
include "gettext.h"
+#
define _(msgid) gettext (msgid)
static int
static int
-try (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)
{
@@
-60,11
+52,13
@@
try (const char *response, const char *pattern, const int match, const int nomat
/* 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
rpmatch (const char *response)
{
int
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. */
@@
-77,4
+71,9
@@
rpmatch (const char *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
}
}