From c53d0910e611bf4cf61f8f8cb44c6ce70d3e9a05 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Fri, 24 Mar 2023 12:42:34 +0100 Subject: [PATCH] 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: e95a7a795522 ("Cygwin: convert Windows locale handling from LCID to ISO5646 strings") Signed-off-by: Corinna Vinschen --- winsup/cygwin/nlsfuncs.cc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/winsup/cygwin/nlsfuncs.cc b/winsup/cygwin/nlsfuncs.cc index 808bf6a87..a81dff396 100644 --- a/winsup/cygwin/nlsfuncs.cc +++ b/winsup/cygwin/nlsfuncs.cc @@ -74,7 +74,10 @@ __get_rfc5646_from_locale (const char *name, wchar_t *win_locale) if (!wcscmp (locale, L"ber")) wcscpy (locale, L"tzm"); if (ResolveLocaleName (locale, wlocale, ENCODING_LEN + 1) <= 0) - return -1; + { + set_errno (ENOENT); + return -1; + } wcpcpy (win_locale, wlocale); return 1; } @@ -114,7 +117,10 @@ __get_rfc5646_from_locale (const char *name, wchar_t *win_locale) } if (!wlocale[0] && ResolveLocaleName (locale, wlocale, ENCODING_LEN + 1) <= 1) - return -1; + { + set_errno (ENOENT); + return -1; + } /* Check for modifiers changing the script */ const wchar_t *iso15924_script[] = { L"Latn-", L"Cyrl-", L"Deva-", L"Adlm-" };