From 9ce9ee19f849332857ea239ea7a85d739c5f9656 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sun, 18 Dec 2016 10:51:33 -0800 Subject: [PATCH] gnulib: update to latest and adapt to modified dfa API * sed/regexp.c (compile_regex_1): Do away with use of DFA_CASE_FOLD. This gnulib update pulls in a dfa module in which that symbol no longer exists. Instead, it uses RE_ICASE in syntax bits. * m4/.gitignore: Add files created by running bootstrap. * lib/.gitignore: Likewise. --- gnulib | 2 +- lib/.gitignore | 1 + m4/.gitignore | 2 ++ sed/regexp.c | 3 +-- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gnulib b/gnulib index a673fa2..bd70cf6 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit a673fa2e90a69c799f2b31d60ddc48d3119be088 +Subproject commit bd70cf691d1f9a1a514b37b5dcd675bea3b013bd diff --git a/lib/.gitignore b/lib/.gitignore index e46e2fb..8c94888 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -234,3 +234,4 @@ xstrndup.h /hard-locale.c /hard-locale.h /memrchr.c +/minmax.h diff --git a/m4/.gitignore b/m4/.gitignore index 492f9bb..0f70a27 100644 --- a/m4/.gitignore +++ b/m4/.gitignore @@ -224,3 +224,5 @@ xstrndup.m4 /isblank.m4 /limits-h.m4 /memrchr.m4 +/builtin-expect.m4 +/minmax.m4 diff --git a/sed/regexp.c b/sed/regexp.c index bb4a601..1ea8188 100644 --- a/sed/regexp.c +++ b/sed/regexp.c @@ -144,8 +144,7 @@ compile_regex_1 (struct regex *new_regex, int needed_sub) bad_prog(buf); } - int dfaopts = (new_regex->flags & REG_ICASE) ? DFA_CASE_FOLD : 0; - dfaopts |= (buffer_delimiter == '\n') ? 0 : DFA_EOL_NUL; + int dfaopts = buffer_delimiter == '\n' ? 0 : DFA_EOL_NUL; new_regex->dfa = dfaalloc (); dfasyntax (new_regex->dfa, &localeinfo, syntax, dfaopts); dfacomp (new_regex->re, new_regex->sz, new_regex->dfa, 1);