diff options
| author | Rich Felker <dalias@aerifal.cx> | 2018-03-07 11:22:38 -0500 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2018-03-07 11:22:38 -0500 |
| commit | 0cf50581ec5f04feeaa77f2eb8b734a4b69ca8ed (patch) | |
| tree | c772b463b775871047461b68ec808116c5887327 /src | |
| parent | 57b97b42bdecafd81c4967a10aef6eaf43d3fcb8 (diff) | |
| download | musl-0cf50581ec5f04feeaa77f2eb8b734a4b69ca8ed.tar.gz musl-0cf50581ec5f04feeaa77f2eb8b734a4b69ca8ed.tar.bz2 musl-0cf50581ec5f04feeaa77f2eb8b734a4b69ca8ed.tar.xz musl-0cf50581ec5f04feeaa77f2eb8b734a4b69ca8ed.zip | |
fix nl_langinfo_l(CODESET, loc) reporting wrong locale's value
use of MB_CUR_MAX encoded a hidden dependency on the currently active
locale for the calling thread, whereas nl_langinfo_l is supposed to
report for the locale passed as an argument.
Diffstat (limited to 'src')
| -rw-r--r-- | src/locale/langinfo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/locale/langinfo.c b/src/locale/langinfo.c index b16caf44..83be6433 100644 --- a/src/locale/langinfo.c +++ b/src/locale/langinfo.c @@ -33,7 +33,7 @@ char *__nl_langinfo_l(nl_item item, locale_t loc) int idx = item & 65535; const char *str; - if (item == CODESET) return MB_CUR_MAX==1 ? "ASCII" : "UTF-8"; + if (item == CODESET) return loc->cat[LC_CTYPE] ? "UTF-8" : "ASCII"; /* _NL_LOCALE_NAME extension */ if (idx == 65535 && cat < LC_ALL) |