|
 |
712bd25 |
From 68f09677b7aaedafa8c29280ccd76a034fe269f1 Mon Sep 17 00:00:00 2001
|
|
|
712bd25 |
From: Debian <debian>
|
|
|
712bd25 |
Date: Sun, 23 Nov 2008 17:28:46 +0100
|
|
|
712bd25 |
Subject: [PATCH] Case-insensitive list matching fix
|
|
|
712bd25 |
|
|
|
712bd25 |
This fixes case-insensitive matching of lists in multi-byte character sets.
|
|
|
712bd25 |
Original comment:
|
|
|
712bd25 |
|
|
|
712bd25 |
fix the following problem in multibyte locales.
|
|
|
712bd25 |
% echo Y | egrep -i '[y]'
|
|
|
712bd25 |
%
|
|
|
712bd25 |
|
|
|
712bd25 |
derived from gawk's dfa.c.
|
|
|
712bd25 |
|
|
|
712bd25 |
Original ticket: https://bugzilla.redhat.com/show_bug.cgi?id=123363
|
|
|
712bd25 |
Debian: 61-dfa.c-case_fold-charclass.patch
|
|
|
712bd25 |
---
|
|
|
712bd25 |
src/dfa.c | 14 ++++++++++++++
|
|
|
712bd25 |
1 files changed, 14 insertions(+), 0 deletions(-)
|
|
|
712bd25 |
|
|
|
712bd25 |
diff --git a/src/dfa.c b/src/dfa.c
|
|
|
712bd25 |
index 934be97..088c379 100644
|
|
|
712bd25 |
--- a/src/dfa.c
|
|
|
712bd25 |
+++ b/src/dfa.c
|
|
|
712bd25 |
@@ -689,6 +689,20 @@ parse_bracket_exp_mb ()
|
|
|
712bd25 |
REALLOC_IF_NECESSARY(work_mbc->chars, wchar_t, chars_al,
|
|
|
712bd25 |
work_mbc->nchars + 1);
|
|
|
712bd25 |
work_mbc->chars[work_mbc->nchars++] = (wchar_t)wc;
|
|
|
712bd25 |
+ if (case_fold && (iswlower((wint_t) wc) || iswupper((wint_t) wc)))
|
|
|
712bd25 |
+ {
|
|
|
712bd25 |
+ wint_t altcase;
|
|
|
712bd25 |
+
|
|
|
712bd25 |
+ altcase = wc; /* keeps compiler happy */
|
|
|
712bd25 |
+ if (iswlower((wint_t) wc))
|
|
|
712bd25 |
+ altcase = towupper((wint_t) wc);
|
|
|
712bd25 |
+ else if (iswupper((wint_t) wc))
|
|
|
712bd25 |
+ altcase = towlower((wint_t) wc);
|
|
|
712bd25 |
+
|
|
|
712bd25 |
+ REALLOC_IF_NECESSARY(work_mbc->chars, wchar_t, chars_al,
|
|
|
712bd25 |
+ work_mbc->nchars + 1);
|
|
|
712bd25 |
+ work_mbc->chars[work_mbc->nchars++] = (wchar_t) altcase;
|
|
|
712bd25 |
+ }
|
|
|
712bd25 |
}
|
|
|
712bd25 |
}
|
|
|
712bd25 |
while ((wc = wc1) != L']');
|
|
|
712bd25 |
--
|
|
|
712bd25 |
1.5.5.1
|
|
|
712bd25 |
|