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>.

diff --git a/ChangeLog b/ChangeLog
index 2363f6e..c1ef33d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2012-12-30  Paul Eggert  <eggert@cs.ucla.edu>
 
+       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 (file)
--- 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)
     {