diff options
Diffstat (limited to 'gl')
| -rw-r--r-- | gl/lib/regcomp.c.diff | 39 |
1 files changed, 10 insertions, 29 deletions
diff --git a/gl/lib/regcomp.c.diff b/gl/lib/regcomp.c.diff index a31c39f60..63fc18752 100644 --- a/gl/lib/regcomp.c.diff +++ b/gl/lib/regcomp.c.diff @@ -1,17 +1,8 @@ -diff --git c/lib/regcomp.c i/lib/regcomp.c -index 6472ff6..665b2ab 100644 ---- c/lib/regcomp.c -+++ i/lib/regcomp.c -@@ -18,6 +18,8 @@ - with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -+#include "intprops.h" -+#include "verify.h" - static reg_errcode_t re_compile_internal (regex_t *preg, const char * pattern, - size_t length, reg_syntax_t syntax); - static void re_compile_fastmap_iter (regex_t *bufp, -@@ -541,7 +543,7 @@ regerror (errcode, preg, errbuf, errbuf_size) +diff --git a/lib/regcomp.c b/lib/regcomp.c +index d5968bd..4926676 100644 +--- a/lib/regcomp.c ++++ b/lib/regcomp.c +@@ -541,7 +541,7 @@ regerror (errcode, preg, errbuf, errbuf_size) size_t errbuf_size; #else /* size_t might promote */ size_t @@ -20,7 +11,7 @@ index 6472ff6..665b2ab 100644 char *_Restrict_ errbuf, size_t errbuf_size) #endif { -@@ -1375,7 +1377,7 @@ calc_first (void *extra, bin_tree_t *node) +@@ -1383,7 +1383,7 @@ calc_first (void *extra, bin_tree_t *node) /* Pass 2: compute NEXT on the tree. Preorder visit. */ static reg_errcode_t @@ -29,17 +20,7 @@ index 6472ff6..665b2ab 100644 { switch (node->token.type) { -@@ -2571,7 +2573,8 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa, - /* This loop is actually executed only when end != REG_MISSING, - to rewrite <re>{0,n} as (<re>(<re>...<re>?)?)?... We have - already created the start+1-th copy. */ -- if ((Idx) -1 < 0 || end != REG_MISSING) -+ verify (! TYPE_SIGNED (Idx)); -+ if (end != REG_MISSING) - for (i = start + 2; i <= end; ++i) - { - elem = duplicate_tree (elem, dfa); -@@ -2731,7 +2734,8 @@ static reg_errcode_t +@@ -2744,7 +2744,8 @@ static reg_errcode_t internal_function build_collating_symbol (bitset_t sbcset, # ifdef RE_ENABLE_I18N @@ -49,7 +30,7 @@ index 6472ff6..665b2ab 100644 # endif const unsigned char *name) { -@@ -3309,7 +3313,8 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token, +@@ -3323,7 +3324,8 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token, static reg_errcode_t parse_bracket_element (bracket_elem_t *elem, re_string_t *regexp, @@ -59,7 +40,7 @@ index 6472ff6..665b2ab 100644 reg_syntax_t syntax, bool accept_hyphen) { #ifdef RE_ENABLE_I18N -@@ -3396,8 +3401,9 @@ parse_bracket_symbol (bracket_elem_t *elem, re_string_t *regexp, +@@ -3410,8 +3412,9 @@ parse_bracket_symbol (bracket_elem_t *elem, re_string_t *regexp, static reg_errcode_t #ifdef RE_ENABLE_I18N @@ -71,7 +52,7 @@ index 6472ff6..665b2ab 100644 #else /* not RE_ENABLE_I18N */ build_equiv_class (bitset_t sbcset, const unsigned char *name) #endif /* not RE_ENABLE_I18N */ -@@ -3798,7 +3804,7 @@ free_token (re_token_t *node) +@@ -3816,7 +3819,7 @@ free_token (re_token_t *node) and its children. */ static reg_errcode_t |