From 2f76d88d7dba542d15fce687b7d05ef026ab267b Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 10 Aug 2001 05:59:19 +0000 Subject: Update. * posix/fnmatch_loop.c: Fix computation of alignment. 2001-08-09 Isamu Hasegawa * posix/regex.c (wcs_regex_compile): Use appropriate string to compare with collating element. Fix the padding for the alignment. 2001-08-09 Isamu Hasegawa * locale/programs/ld-collate.c (collate_output): Exclude characters from elem_table. Reduce if clause to write collating elements correctly. * posix/Makefile (tests): Add bug-regex5. * posix/bug-regex5.c: New file. 2001-08-09 Ulrich Drepper --- posix/regex.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'posix/regex.c') diff --git a/posix/regex.c b/posix/regex.c index e4ac58b..ee38fdf 100644 --- a/posix/regex.c +++ b/posix/regex.c @@ -3055,7 +3055,7 @@ PREFIX(regex_compile) (ARG_PREFIX(pattern), ARG_PREFIX(size), syntax, bufp) /* First compare the hashing value. */ if (symb_table[2 * elem] == hash && c1 == extra[symb_table[2 * elem + 1]] - && memcmp (str, + && memcmp (char_str, &extra[symb_table[2 * elem + 1] + 1], c1) == 0) { @@ -3075,7 +3075,7 @@ PREFIX(regex_compile) (ARG_PREFIX(pattern), ARG_PREFIX(size), syntax, bufp) in the table. */ idx += 1 + extra[idx]; /* Adjust for the alignment. */ - idx = (idx + 3) & ~4; + idx = (idx + 3) & ~3; str[0] = (wchar_t) idx + 4; } -- cgit v1.1