security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-09 12:54:23 +01:00
Code Activity

tools: Use internal regexp routines.

Browse Source 
* tools/gpg-check-pattern.c: Use jimregexp.h.

--

Backport master commit of:
	7ee2a9687da9560a5d17c7046c87c2f7a6733d5c

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2020-04-06 09:38:13 +09:00
parent 1d1f2aa943
commit b4cbb5f58a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/gpg-check-pattern.c
View File

@ -37,13 +37,13 @@
#endif #endif
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <regex.h>
#include <ctype.h> #include <ctype.h>
#include "../common/util.h" #include "../common/util.h"
#include "../common/i18n.h" #include "../common/i18n.h"
#include "../common/sysutils.h" #include "../common/sysutils.h"
#include "../common/init.h" #include "../common/init.h"
#include "../regexp/jimregexp.h"
enum cmd_and_opt_values 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. */ p[strlen(p)-1] = 0; /* Remove optional delimiter. */
array[arrayidx].u.r.regex = xcalloc (1, sizeof (regex_t)); array[arrayidx].u.r.regex = xcalloc (1, sizeof (regex_t));
rerr = regcomp (array[arrayidx].u.r.regex, p, rerr = regcomp (array[arrayidx].u.r.regex, p,
REG_ICASE|REG_NOSUB|REG_EXTENDED); REG_ICASE|REG_EXTENDED);
if (rerr) if (rerr)
{ {
char *rerrbuf = get_regerror (rerr, array[arrayidx].u.r.regex); char *rerrbuf = get_regerror (rerr, array[arrayidx].u.r.regex);