From b4cbb5f58a00fa5ac9f1282664c0adb7ecfa9e57 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Mon, 6 Apr 2020 09:38:13 +0900 Subject: [PATCH] tools: Use internal regexp routines. * tools/gpg-check-pattern.c: Use jimregexp.h. -- Backport master commit of: 7ee2a9687da9560a5d17c7046c87c2f7a6733d5c Signed-off-by: NIIBE Yutaka --- tools/gpg-check-pattern.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/gpg-check-pattern.c b/tools/gpg-check-pattern.c index 4db8f3706..e4906d26c 100644 --- a/tools/gpg-check-pattern.c +++ b/tools/gpg-check-pattern.c @@ -37,13 +37,13 @@ #endif #include #include -#include #include #include "../common/util.h" #include "../common/i18n.h" #include "../common/sysutils.h" #include "../common/init.h" +#include "../regexp/jimregexp.h" enum cmd_and_opt_values @@ -369,7 +369,7 @@ parse_pattern_file (char *data, size_t datalen) p[strlen(p)-1] = 0; /* Remove optional delimiter. */ array[arrayidx].u.r.regex = xcalloc (1, sizeof (regex_t)); rerr = regcomp (array[arrayidx].u.r.regex, p, - REG_ICASE|REG_NOSUB|REG_EXTENDED); + REG_ICASE|REG_EXTENDED); if (rerr) { char *rerrbuf = get_regerror (rerr, array[arrayidx].u.r.regex);