From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id CE0053858C5E; Tue, 14 Feb 2023 12:10:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CE0053858C5E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1676376608; bh=z78cdoRWHx3aP/pmeiB67Mr2JeXSSKyXk9I/m497te8=; h=From:To:Subject:Date:From; b=PF8a4PtcorTBvDNFNWsTOvjfoK2Wf3JU4NwSOv5nWwXaCmVdvGynnXNUi4nHbpGcz 1oGcVOXTkcQud2IbzhgdiauaS2PQltNp4Ovo/LjG77lqpbiPxo3BCBKBChrAka5Cwg G2jhYDzZBe0QFf/QE6Xwgr1FRtqyyOI98OKX98jQ= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin/main] Cygwin: glob: convert wchar_t to wint_t X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/main X-Git-Oldrev: 99da4956c5976770c1c1ce3d284c60c0cb5f1b57 X-Git-Newrev: 0321fb5736545b5535e640b99b550ed6249f0e0c Message-Id: <20230214121008.CE0053858C5E@sourceware.org> Date: Tue, 14 Feb 2023 12:10:08 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D0321fb57365= 45b5535e640b99b550ed6249f0e0c commit 0321fb5736545b5535e640b99b550ed6249f0e0c Author: Corinna Vinschen AuthorDate: Tue Feb 14 12:48:03 2023 +0100 Commit: Corinna Vinschen CommitDate: Tue Feb 14 12:48:31 2023 +0100 Cygwin: glob: convert wchar_t to wint_t =20 ...thus handling all Unicode values sanely. =20 Signed-off-by: Corinna Vinschen Diff: --- winsup/cygwin/glob.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/winsup/cygwin/glob.cc b/winsup/cygwin/glob.cc index 0d9f9c88532a..61fa610d60a0 100644 --- a/winsup/cygwin/glob.cc +++ b/winsup/cygwin/glob.cc @@ -71,7 +71,7 @@ __FBSDID("$FreeBSD: src/lib/libc/gen/glob.c,v 1.28 2010/0= 5/12 17:44:00 gordon Ex * GLOB_NOCHECK is specified. * 2. Illegal byte sequences in filenames are handled by treating them as * single-byte characters with a value of the first byte of the sequence - * cast to wchar_t. + * cast to wint_t. * 3. State-dependent encodings are not currently supported. */ =20 @@ -162,7 +162,7 @@ static int compare(const void *, const void *); static int g_Ctoc(const Char *, char *, size_t); static int g_lstat(Char *, struct stat *, glob_t *); static DIR *g_opendir(Char *, glob_t *); -static const Char *g_strchr(const Char *, wchar_t); +static const Char *g_strchr(const Char *, wint_t); #ifdef notdef static Char *g_strcat(Char *, const Char *); #endif @@ -188,7 +188,7 @@ glob(const char *__restrict pattern, int flags, int (*e= rrfunc)(const char *, int size_t limit; Char *bufnext, *bufend, patbuf[MAXPATHLEN], prot; mbstate_t mbs; - wchar_t wc; + wint_t wc; size_t clen; =20 patnext =3D pattern; @@ -213,7 +213,7 @@ glob(const char *__restrict pattern, int flags, int (*e= rrfunc)(const char *, int if (flags & GLOB_NOESCAPE) { memset(&mbs, 0, sizeof(mbs)); while (bufend - bufnext >=3D MB_CUR_MAX) { - clen =3D mbrtowc(&wc, patnext, MB_LEN_MAX, &mbs); + clen =3D mbrtowi(&wc, patnext, MB_LEN_MAX, &mbs); if (clen =3D=3D (size_t)-1 || clen =3D=3D (size_t)-2) return (GLOB_NOMATCH); else if (clen =3D=3D 0) @@ -233,7 +233,7 @@ glob(const char *__restrict pattern, int flags, int (*e= rrfunc)(const char *, int prot =3D M_PROTECT; } else prot =3D 0; - clen =3D mbrtowc(&wc, patnext, MB_LEN_MAX, &mbs); + clen =3D mbrtowi(&wc, patnext, MB_LEN_MAX, &mbs); if (clen =3D=3D (size_t)-1 || clen =3D=3D (size_t)-2) return (GLOB_NOMATCH); else if (clen =3D=3D 0) @@ -663,7 +663,7 @@ glob3(Char *pathbuf, Char *pathend, Char *pathend_last, while ((dp =3D (*readdirfunc)(dirp))) { char *sc; Char *dc; - wchar_t wc; + wint_t wc; size_t clen; mbstate_t mbs; =20 @@ -674,7 +674,7 @@ glob3(Char *pathbuf, Char *pathend, Char *pathend_last, dc =3D pathend; sc =3D dp->d_name; while (dc < pathend_last) { - clen =3D mbrtowc(&wc, sc, MB_LEN_MAX, &mbs); + clen =3D mbrtowi(&wc, sc, MB_LEN_MAX, &mbs); if (clen =3D=3D (size_t)-1 || clen =3D=3D (size_t)-2) { wc =3D *sc; clen =3D 1; @@ -883,7 +883,7 @@ g_stat(Char *fn, struct stat *sb, glob_t *pglob) } =20 static const Char * -g_strchr(const Char *str, wchar_t ch) +g_strchr(const Char *str, wint_t ch) { =20 do {