diff options
author | Corinna Vinschen <corinna@vinschen.de> | 2023-03-16 14:44:32 +0300 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2023-03-16 15:46:01 +0300 |
commit | 0bdc764b421b56ac2961ce54f538d4a71f38b724 (patch) | |
tree | ec011605c40c6bc8646f80ce4b30d5d7986ab489 /winsup/cygwin/regex | |
parent | 585e7f9891d68cf14a5fdce70e1f1c613c98bb94 (diff) |
Cygwin: regex: wgetnext: Re-add kludge to be more glibc compatible
Add comment to explain.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diffstat (limited to 'winsup/cygwin/regex')
-rw-r--r-- | winsup/cygwin/regex/regcomp.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/winsup/cygwin/regex/regcomp.c b/winsup/cygwin/regex/regcomp.c index 3c7359310..59da896a9 100644 --- a/winsup/cygwin/regex/regcomp.c +++ b/winsup/cygwin/regex/regcomp.c @@ -1528,6 +1528,18 @@ wgetnext(struct parse *p) wint_t wc; 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)); n = mbrtowi(&wc, p->next, p->end - p->next, &mbs); if (n == (size_t)-1 || n == (size_t)-2) { |