[newlib-cygwin/main] Cygwin: locales: set errno to ENOENT if locale is invalid

[newlib-cygwin/main] Cygwin: locales: set errno to ENOENT if locale is invalid

[Corinna Vinschen]

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=c53d0910e611bf4cf61f8f8cb44c6ce70d3e9a05

commit c53d0910e611bf4cf61f8f8cb44c6ce70d3e9a05
Author:     Corinna Vinschen <corinna@vinschen.de>
AuthorDate: Fri Mar 24 12:42:34 2023 +0100
Commit:     Corinna Vinschen <corinna@vinschen.de>
CommitDate: Fri Mar 24 12:50:59 2023 +0100

    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 <corinna@vinschen.de>

Diff:
---
 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 808bf6a87320..a81dff3966d7 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-" };