projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New file to override autoconf's AC_SEARCH_LIBS.
[gnulib.git]
/
lib
/
rpmatch.c
diff --git
a/lib/rpmatch.c
b/lib/rpmatch.c
index
9cc5175
..
fbd62e2
100644
(file)
--- a/
lib/rpmatch.c
+++ b/
lib/rpmatch.c
@@
-29,18
+29,15
@@
# endif
#endif
# endif
#endif
-#include <sys/types.h>
-#include <regex.h>
-
#if ENABLE_NLS
#if ENABLE_NLS
+# include <sys/types.h>
+# include <regex.h>
# include <libintl.h>
# define _(Text) gettext (Text)
# include <libintl.h>
# define _(Text) gettext (Text)
-#else
-# define _(Text) Text
-#endif
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
+57,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
+76,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
}
}