drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cygwin: locales: drop supporting iso639 strings as valid locales 

This was incorrect behaviour.  The only valid way to support those
is by adding them to /usr/share/locale/locale.alias.

Fixes: e95a7a7955 ("Cygwin: convert Windows locale handling from LCID to ISO5646 strings")
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2023-03-24 12:43:30 +01:00
parent c53d0910e6
commit 15898b9588
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
winsup/cygwin/nlsfuncs.cc
View File

@ -69,17 +69,8 @@ __get_rfc5646_from_locale (const char *name, wchar_t *win_locale)
c = wcschr (locale, '_'); c = wcschr (locale, '_');
if (!c) if (!c)
{ {
/* try if the locale can be resolved from the language tag set_errno (ENOENT);
fix up Linux-only locale first */ return -1;
if (!wcscmp (locale, L"ber"))
wcscpy (locale, L"tzm");
if (ResolveLocaleName (locale, wlocale, ENCODING_LEN + 1) <= 0)
{
set_errno (ENOENT);
return -1;
}
wcpcpy (win_locale, wlocale);
return 1;
} }
/* Convert to RFC 5646 syntax. */ /* Convert to RFC 5646 syntax. */