about summary refs log tree commit diff
path: root/posix/regex.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-08-10 05:59:19 +0000
committerUlrich Drepper <drepper@redhat.com>2001-08-10 05:59:19 +0000
commit2f76d88d7dba542d15fce687b7d05ef026ab267b (patch)
tree53a637396c32a9ffd910a43a479775d3e332152b /posix/regex.c
parent2b15132f986df6e8dcc2355f6e3e618550d1922b (diff)
downloadglibc-2f76d88d7dba542d15fce687b7d05ef026ab267b.tar.gz
glibc-2f76d88d7dba542d15fce687b7d05ef026ab267b.tar.xz
glibc-2f76d88d7dba542d15fce687b7d05ef026ab267b.zip
Update.
	* posix/fnmatch_loop.c: Fix computation of alignment.

2001-08-09  Isamu Hasegawa  <isamu@yamato.ibm.com>

	* 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  <isamu@yamato.ibm.com>

	* 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  <drepper@redhat.com>
Diffstat (limited to 'posix/regex.c')
-rw-r--r--posix/regex.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/posix/regex.c b/posix/regex.c
index e4ac58bfbc..ee38fdfd2e 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;
 				  }