diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2023-03-03 13:32:31 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2023-03-03 20:19:17 +0300 |
| commit | 6bc687e35d6a74b4b9d8531c73b3f6cc571bc744 (patch) | |
| tree | d6f5e8b57f9fc54eccbfc1e1c25300794a923ed8 | |
| parent | 1d3d2ba54bf7fb7f47510b70cc71489b293ff60d (diff) | |
Cygwin: glob: fix conversion from UTF-32 to multibyte
The conversion function g_Ctoc missed to drop the flag
values from the wint_t value. That wasn't noticable with
the original version because it used a 64 bit Char type
and the flags were in the upper 32 bit region. So the
flag values were silently dropped when wcrtomb was called.
After converting Char to wint_t, we have to do drop the
flags explicitely.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
| -rw-r--r-- | winsup/cygwin/glob.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/winsup/cygwin/glob.cc b/winsup/cygwin/glob.cc index dadc67e4c..4730d09f5 100644 --- a/winsup/cygwin/glob.cc +++ b/winsup/cygwin/glob.cc @@ -130,7 +130,7 @@ __FBSDID("$FreeBSD: src/lib/libc/gen/glob.c,v 1.28 2010/05/12 17:44:00 gordon Ex #define M_PROTECT 0x20000000U #define M_MASK 0x70ffffffU #define M_COLL_MASK 0x700000ffU -#define M_CHAR 0x0fffffffU +#define M_CHAR 0x00ffffffU typedef wint_t Char; @@ -1030,7 +1030,7 @@ g_Ctoc(const Char *str, char *buf, size_t len) memset(&mbs, 0, sizeof(mbs)); while (len >= (size_t) MB_CUR_MAX) { - clen = wirtomb(buf, *str, &mbs); + clen = wirtomb(buf, CHAR (*str), &mbs); if (clen == (size_t)-1) return (1); if (*str == L'\0') |