[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/3] regex: revert single-byte change
From: |
Paul Eggert |
Subject: |
[PATCH 2/3] regex: revert single-byte change |
Date: |
Sun, 30 Dec 2012 19:28:23 -0800 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 |
---
ChangeLog | 7 +++++++
lib/regexec.c | 6 +-----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2363f6e..c1ef33d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2012-12-30 Paul Eggert <address@hidden>
+ regex: revert single-byte change
+ * lib/regexec.c (check_node_accept_bytes): Revert previous change
+ to this function. This was alredy fixed in a different way, at
+ bdb56bacd57070eced9998569ffe3f3c37ef5964 in the glibc git; see
+ <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=510219> and
+ <http://sourceware.org/bugzilla/show_bug.cgi?id=9697>.
+
regex: simplify based on Gawk version
* lib/regex_internal.c (re_dfa_add_node): Simplify.
Reported by Aharon Robbins in
diff --git a/lib/regexec.c b/lib/regexec.c
index b10efb3..22e8dd6 100644
--- a/lib/regexec.c
+++ b/lib/regexec.c
@@ -3858,11 +3858,7 @@ check_node_accept_bytes (const re_dfa_t *dfa, Idx
node_idx,
elem_len = re_string_elem_size_at (input, str_idx);
if ((elem_len <= 1 && char_len <= 1) || char_len == 0)
- {
- wint_t wc = __btowc (input->mbs[str_idx]);
- if (wc < SBC_MAX && wc != WEOF)
- return 0;
- }
+ return 0;
if (node->type == COMPLEX_BRACKET)
{
--
1.7.11.7
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH 2/3] regex: revert single-byte change,
Paul Eggert <=