diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2014-03-10 22:40:16 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2014-03-10 22:40:16 +0200 |
| commit | 6736261fb372cce9bc6c71deea6944fc882c79bb (patch) | |
| tree | cb892db1cc35026fbca919ef256891dccbe8efb6 /regex_internal.c | |
| parent | 23e7f1057b1abdebb25fc7d2f11ee3f5360976a4 (diff) | |
| parent | 0102531b85a7cb85320c0b499c52d44f6822d1f0 (diff) | |
| download | egawk-6736261fb372cce9bc6c71deea6944fc882c79bb.tar.gz egawk-6736261fb372cce9bc6c71deea6944fc882c79bb.tar.bz2 egawk-6736261fb372cce9bc6c71deea6944fc882c79bb.zip | |
Merge branch 'gawk-4.1-stable'
Diffstat (limited to 'regex_internal.c')
| -rw-r--r-- | regex_internal.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/regex_internal.c b/regex_internal.c index 10dd6e00..056cff3d 100644 --- a/regex_internal.c +++ b/regex_internal.c @@ -320,12 +320,11 @@ build_wcs_upper_buffer (re_string_t *pstr) + byte_idx), remain_len, &pstr->cur_state); if (BE (mbclen + 2 > 2, 1)) { - wchar_t wcu = wc; - if (iswlower (wc)) + wchar_t wcu = towupper (wc); + if (wcu != wc) { size_t mbcdlen; - wcu = towupper (wc); mbcdlen = wcrtomb (buf, wcu, &prev_st); if (BE (mbclen == mbcdlen, 1)) memcpy (pstr->mbs + byte_idx, buf, mbclen); @@ -390,12 +389,11 @@ build_wcs_upper_buffer (re_string_t *pstr) mbclen = __mbrtowc (&wc, p, remain_len, &pstr->cur_state); if (BE (mbclen + 2 > 2, 1)) { - wchar_t wcu = wc; - if (iswlower (wc)) + wchar_t wcu = towupper (wc); + if (wcu != wc) { size_t mbcdlen; - wcu = towupper (wc); mbcdlen = wcrtomb ((char *) buf, wcu, &prev_st); if (BE (mbclen == mbcdlen, 1)) memcpy (pstr->mbs + byte_idx, buf, mbclen); @@ -547,10 +545,7 @@ build_upper_buffer (re_string_t *pstr) int ch = pstr->raw_mbs[pstr->raw_mbs_idx + char_idx]; if (BE (pstr->trans != NULL, 0)) ch = pstr->trans[ch]; - if (islower (ch)) - pstr->mbs[char_idx] = toupper (ch); - else - pstr->mbs[char_idx] = ch; + pstr->mbs[char_idx] = toupper (ch); } pstr->valid_len = char_idx; pstr->valid_raw_len = char_idx; |