[newlib-cygwin/main] Cygwin: locales: drop supporting iso639 strings as valid locales

[newlib-cygwin/main] Cygwin: locales: drop supporting iso639 strings as valid locales

[Corinna Vinschen]

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

commit 15898b95881b1fa504e671e0bcfd653b242effa8
Author:     Corinna Vinschen <corinna@vinschen.de>
AuthorDate: Fri Mar 24 12:43:30 2023 +0100
Commit:     Corinna Vinschen <corinna@vinschen.de>
CommitDate: Fri Mar 24 12:50:59 2023 +0100

    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: e95a7a795522 ("Cygwin: convert Windows locale handling from LCID to ISO5646 strings")
    Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

Diff:
---
 winsup/cygwin/nlsfuncs.cc | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/winsup/cygwin/nlsfuncs.cc b/winsup/cygwin/nlsfuncs.cc
index a81dff3966d7..34f25034af2b 100644
--- a/winsup/cygwin/nlsfuncs.cc
+++ b/winsup/cygwin/nlsfuncs.cc
@@ -69,17 +69,8 @@ __get_rfc5646_from_locale (const char *name, wchar_t *win_locale)
   c = wcschr (locale, '_');
   if (!c)
     {
-      /* try if the locale can be resolved from the language tag
-         fix up Linux-only locale first */
-      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;
+      set_errno (ENOENT);
+      return -1;
     }
 
   /* Convert to RFC 5646 syntax. */