libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cygwin: fnmatch: convert wchar_t to wint_t 

...thus handling all Unicode values sanely.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2023-02-14 12:47:54 +01:00
parent eac830e0fe
commit 99da4956c5
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
winsup/cygwin/libc/fnmatch.c
View File

@ -52,7 +52,7 @@ __FBSDID("$FreeBSD: head/lib/libc/gen/fnmatch.c 288309 2015-09-27 12:52:18Z jill
* 1. Patterns with illegal byte sequences match nothing. * 1. Patterns with illegal byte sequences match nothing.
* 2. Illegal byte sequences in the "string" argument are handled by treating * 2. Illegal byte sequences in the "string" argument are handled by treating
* them as single-byte characters with a value of the first byte of the * them as single-byte characters with a value of the first byte of the
* sequence cast to wchar_t. * sequence cast to wint_t.
* 3. Multibyte conversion state objects (mbstate_t) are passed around and * 3. Multibyte conversion state objects (mbstate_t) are passed around and
* used for most, but not all, conversions. Further work will be required * used for most, but not all, conversions. Further work will be required
* to support state-dependent encodings. * to support state-dependent encodings.
@ -72,7 +72,7 @@ __FBSDID("$FreeBSD: head/lib/libc/gen/fnmatch.c 288309 2015-09-27 12:52:18Z jill
#define RANGE_NOMATCH 0 #define RANGE_NOMATCH 0
#define RANGE_ERROR (-1) #define RANGE_ERROR (-1)
static int rangematch(const char *, wchar_t, int, char **, mbstate_t *); static int rangematch(const char *, wint_t, int, char **, mbstate_t *);
static int fnmatch1(const char *, const char *, const char *, int, mbstate_t, static int fnmatch1(const char *, const char *, const char *, int, mbstate_t,
mbstate_t); mbstate_t);
@ -92,16 +92,16 @@ fnmatch1(const char *pattern, const char *string, const char *stringstart,
mbstate_t bt_patmbs, bt_strmbs; mbstate_t bt_patmbs, bt_strmbs;
char *newp; char *newp;
char c; char c;
wchar_t pc, sc; wint_t pc, sc;
size_t pclen, sclen; size_t pclen, sclen;
bt_pattern = bt_string = NULL; bt_pattern = bt_string = NULL;
for (;;) { for (;;) {
pclen = mbrtowc(&pc, pattern, MB_LEN_MAX, &patmbs); pclen = mbrtowi(&pc, pattern, MB_LEN_MAX, &patmbs);
if (pclen == (size_t)-1 || pclen == (size_t)-2) if (pclen == (size_t)-1 || pclen == (size_t)-2)
return (FNM_NOMATCH); return (FNM_NOMATCH);
pattern += pclen; pattern += pclen;
sclen = mbrtowc(&sc, string, MB_LEN_MAX, &strmbs); sclen = mbrtowi(&sc, string, MB_LEN_MAX, &strmbs);
if (sclen == (size_t)-1 || sclen == (size_t)-2) { if (sclen == (size_t)-1 || sclen == (size_t)-2) {
sc = (unsigned char)*string; sc = (unsigned char)*string;
sclen = 1; sclen = 1;
@ -183,7 +183,7 @@ fnmatch1(const char *pattern, const char *string, const char *stringstart,
break; break;
case '\\': case '\\':
if (!(flags & FNM_NOESCAPE)) { if (!(flags & FNM_NOESCAPE)) {
pclen = mbrtowc(&pc, pattern, MB_LEN_MAX, pclen = mbrtowi(&pc, pattern, MB_LEN_MAX,
&patmbs); &patmbs);
if (pclen == (size_t)-1 || pclen == (size_t)-2) if (pclen == (size_t)-1 || pclen == (size_t)-2)
return (FNM_NOMATCH); return (FNM_NOMATCH);
@ -208,7 +208,7 @@ fnmatch1(const char *pattern, const char *string, const char *stringstart,
*/ */
if (bt_pattern == NULL) if (bt_pattern == NULL)
return (FNM_NOMATCH); return (FNM_NOMATCH);
sclen = mbrtowc(&sc, bt_string, MB_LEN_MAX, sclen = mbrtowi(&sc, bt_string, MB_LEN_MAX,
&bt_strmbs); &bt_strmbs);
if (sclen == (size_t)-1 || if (sclen == (size_t)-1 ||
sclen == (size_t)-2) { sclen == (size_t)-2) {
@ -232,11 +232,11 @@ fnmatch1(const char *pattern, const char *string, const char *stringstart,
} }
static int static int
rangematch(const char *pattern, wchar_t test, int flags, char **newp, rangematch(const char *pattern, wint_t test, int flags, char **newp,
mbstate_t *patmbs) mbstate_t *patmbs)
{ {
int negate, ok; int negate, ok;
wchar_t c, c2; wint_t c, c2;
size_t pclen; size_t pclen;
const char *origpat; const char *origpat;
#ifndef __CYGWIN__ #ifndef __CYGWIN__
@ -274,7 +274,7 @@ rangematch(const char *pattern, wchar_t test, int flags, char **newp,
return (RANGE_NOMATCH); return (RANGE_NOMATCH);
} else if (*pattern == '\\' && !(flags & FNM_NOESCAPE)) } else if (*pattern == '\\' && !(flags & FNM_NOESCAPE))
pattern++; pattern++;
pclen = mbrtowc(&c, pattern, MB_LEN_MAX, patmbs); pclen = mbrtowi(&c, pattern, MB_LEN_MAX, patmbs);
if (pclen == (size_t)-1 || pclen == (size_t)-2) if (pclen == (size_t)-1 || pclen == (size_t)-2)
return (RANGE_NOMATCH); return (RANGE_NOMATCH);
pattern += pclen; pattern += pclen;
@ -287,7 +287,7 @@ rangematch(const char *pattern, wchar_t test, int flags, char **newp,
if (*++pattern == '\\' && !(flags & FNM_NOESCAPE)) if (*++pattern == '\\' && !(flags & FNM_NOESCAPE))
if (*pattern != EOS) if (*pattern != EOS)
pattern++; pattern++;
pclen = mbrtowc(&c2, pattern, MB_LEN_MAX, patmbs); pclen = mbrtowi(&c2, pattern, MB_LEN_MAX, patmbs);
if (pclen == (size_t)-1 || pclen == (size_t)-2) if (pclen == (size_t)-1 || pclen == (size_t)-2)
return (RANGE_NOMATCH); return (RANGE_NOMATCH);
pattern += pclen; pattern += pclen;