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

Cygwin: locales: set errno to ENOENT if locale is invalid 

This allows newlocale to return with a valid errno if the
locale is invalid.

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:42:34 +01:00
parent 676796498d
commit c53d0910e6
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/nlsfuncs.cc
View File

@ -74,7 +74,10 @@ __get_rfc5646_from_locale (const char *name, wchar_t *win_locale)
if (!wcscmp (locale, L"ber")) if (!wcscmp (locale, L"ber"))
wcscpy (locale, L"tzm"); wcscpy (locale, L"tzm");
if (ResolveLocaleName (locale, wlocale, ENCODING_LEN + 1) <= 0) if (ResolveLocaleName (locale, wlocale, ENCODING_LEN + 1) <= 0)
{
set_errno (ENOENT);
return -1; return -1;
}
wcpcpy (win_locale, wlocale); wcpcpy (win_locale, wlocale);
return 1; return 1;
} }
@ -114,7 +117,10 @@ __get_rfc5646_from_locale (const char *name, wchar_t *win_locale)
} }
if (!wlocale[0] if (!wlocale[0]
&& ResolveLocaleName (locale, wlocale, ENCODING_LEN + 1) <= 1) && ResolveLocaleName (locale, wlocale, ENCODING_LEN + 1) <= 1)
{
set_errno (ENOENT);
return -1; return -1;
}
/* Check for modifiers changing the script */ /* Check for modifiers changing the script */
const wchar_t *iso15924_script[] = { L"Latn-", L"Cyrl-", L"Deva-", L"Adlm-" }; const wchar_t *iso15924_script[] = { L"Latn-", L"Cyrl-", L"Deva-", L"Adlm-" };