summary refs log tree commit diff
path: root/posix/regex_internal.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-11-12 06:13:10 +0000
committerUlrich Drepper <drepper@redhat.com>2003-11-12 06:13:10 +0000
commit74e12fbc03bb19ee8cbd880d0def24409ce0c6f8 (patch)
treea4fbc770b743c6072293de5e210f07f7518a3af9 /posix/regex_internal.c
parent8b965f3da4b948a10f232e5713a64cbb064d70ac (diff)
downloadglibc-74e12fbc03bb19ee8cbd880d0def24409ce0c6f8.tar.gz
glibc-74e12fbc03bb19ee8cbd880d0def24409ce0c6f8.tar.xz
glibc-74e12fbc03bb19ee8cbd880d0def24409ce0c6f8.zip
Update.
2003-11-11  Jakub Jelinek  <jakub@redhat.com>

	* posix/regcomp.c (re_compile_fastmap_iter): Handle RE_ICASE
	with MB_CUR_MAX > 1 locales in the fastmap.

2003-11-11  Jakub Jelinek  <jakub@redhat.com>

	* posix/regex_internal.c (build_wcs_buffer): Fix comment typo.
	(build_wcs_upper_buffer): Likewise.  Use towupper for wchar_t instead
	of toupper.
	* posix/Makefile (tests): Add bug-regex17 and bug-regex18.
	(bug-regex17-ENV, bug-regex18-ENV): Add LOCPATH.
	* posix/bug-regex18.c: New test.
Diffstat (limited to 'posix/regex_internal.c')
-rw-r--r--posix/regex_internal.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/posix/regex_internal.c b/posix/regex_internal.c
index f969c7c89f..e328243a57 100644
--- a/posix/regex_internal.c
+++ b/posix/regex_internal.c
@@ -220,7 +220,7 @@ build_wcs_buffer (pstr)
 	  pstr->cur_state = prev_st;
 	}
 
-      /* Apply the translateion if we need.  */
+      /* Apply the translation if we need.  */
       if (pstr->trans != NULL && mbclen == 1)
 	{
 	  int ch = pstr->trans[pstr->raw_mbs[pstr->raw_mbs_idx + byte_idx]];
@@ -264,13 +264,13 @@ build_wcs_upper_buffer (pstr)
 	{
 	  /* In case of a singlebyte character.  */
 	  int ch = pstr->raw_mbs[pstr->raw_mbs_idx + byte_idx];
-	  /* Apply the translateion if we need.  */
+	  /* Apply the translation if we need.  */
 	  if (pstr->trans != NULL && mbclen == 1)
 	    {
 	      ch = pstr->trans[ch];
 	      pstr->mbs_case[byte_idx] = ch;
 	    }
-	  pstr->wcs[byte_idx] = iswlower (wc) ? toupper (wc) : wc;
+	  pstr->wcs[byte_idx] = iswlower (wc) ? towupper (wc) : wc;
 	  pstr->mbs[byte_idx++] = islower (ch) ? toupper (ch) : ch;
 	  if (BE (mbclen == (size_t) -1, 0))
 	    pstr->cur_state = prev_st;
@@ -282,7 +282,7 @@ build_wcs_upper_buffer (pstr)
 	  else
 	    memcpy (pstr->mbs + byte_idx,
 		    pstr->raw_mbs + pstr->raw_mbs_idx + byte_idx, mbclen);
-	  pstr->wcs[byte_idx++] = iswlower (wc) ? toupper (wc) : wc;
+	  pstr->wcs[byte_idx++] = iswlower (wc) ? towupper (wc) : wc;
 	  /* Write paddings.  */
 	  for (remain_len = byte_idx + mbclen - 1; byte_idx < remain_len ;)
 	    pstr->wcs[byte_idx++] = WEOF;
@@ -342,7 +342,7 @@ build_upper_buffer (pstr)
       int ch = pstr->raw_mbs[pstr->raw_mbs_idx + char_idx];
       if (pstr->trans != NULL)
 	{
-	  ch =  pstr->trans[ch];
+	  ch = pstr->trans[ch];
 	  pstr->mbs_case[char_idx] = ch;
 	}
       if (islower (ch))