Cygwin: regex: wgetnext: Re-add kludge to be more glibc compatible
Add comment to explain. Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
parent
585e7f9891
commit
0bdc764b42
|
@ -1528,6 +1528,18 @@ wgetnext(struct parse *p)
|
||||||
wint_t wc;
|
wint_t wc;
|
||||||
size_t n;
|
size_t n;
|
||||||
|
|
||||||
|
#ifdef __CYGWIN__
|
||||||
|
/* Kludge for more glibc compatibility. On Cygwin as well as on
|
||||||
|
Linux, mbrtowc returns -1 if the current local's codeset is ASCII
|
||||||
|
and the character is >= 0x80. Nevertheless, glibc's regcomp allows
|
||||||
|
any char value, even stuff like [\xc0-\xff], if the locale's codeset
|
||||||
|
is ASCII, so in regcomp it ignores the fact that chars >= 0x80 are
|
||||||
|
invalid ASCII chars. To be more Linux-compatible, we align the
|
||||||
|
behaviour to glibc here. Allow any character value if the current
|
||||||
|
local's codeset is ASCII. */
|
||||||
|
if (*__current_locale_charset () == 'A') /* SCII */
|
||||||
|
return (wint_t) (unsigned char) *p->next++;
|
||||||
|
#endif
|
||||||
memset(&mbs, 0, sizeof(mbs));
|
memset(&mbs, 0, sizeof(mbs));
|
||||||
n = mbrtowi(&wc, p->next, p->end - p->next, &mbs);
|
n = mbrtowi(&wc, p->next, p->end - p->next, &mbs);
|
||||||
if (n == (size_t)-1 || n == (size_t)-2) {
|
if (n == (size_t)-1 || n == (size_t)-2) {
|
||||||
|
|
Loading…
Reference in New Issue