From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 110613858D20; Sat, 25 Mar 2023 21:51:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 110613858D20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1679781090; bh=FDl4A5sL0ODmfs2Adf7gtDUz8x2ynhyKKOcyc+JuQFE=; h=From:To:Subject:Date:From; b=hXhA2/2lQkNnr1nqrMq070H3uTZCYTNuAoZ2gEU+gSM4pZMaoGKDPlOxOS6uS0Av5 ritjdVHU81sdp9PcN//VqnhHFiQHNd54qRKC2LtcbgS7YQ+IKNuceYFMNfi+V+aSCR 6qH02MI4TcD0fqFKlK12a3sq1+ZfTDT+RNrdST4M= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin/main] Revert "Cygwin: locales: drop supporting iso639 strings as valid locales" X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/main X-Git-Oldrev: b5b67a65f87c518b97dbc74e3d20f4654dfa3f10 X-Git-Newrev: 7002f7f7c7d15f81444f00b0f606c750a9edfc53 Message-Id: <20230325215130.110613858D20@sourceware.org> Date: Sat, 25 Mar 2023 21:51:30 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D7002f7f7c7d= 15f81444f00b0f606c750a9edfc53 commit 7002f7f7c7d15f81444f00b0f606c750a9edfc53 Author: Corinna Vinschen AuthorDate: Sat Mar 25 22:28:25 2023 +0100 Commit: Corinna Vinschen CommitDate: Sat Mar 25 22:30:15 2023 +0100 Revert "Cygwin: locales: drop supporting iso639 strings as valid locale= s" =20 This reverts commit 15898b95881b1fa504e671e0bcfd653b242effa8. =20 The idea behind this patch was wrong. Systems are supposed to support iso639-only strings as settings for the locale environment variables, and they are not necessarily available in the /usr/share/locale/locale.alias file. =20 Signed-off-by: Corinna Vinschen Diff: --- winsup/cygwin/nlsfuncs.cc | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/winsup/cygwin/nlsfuncs.cc b/winsup/cygwin/nlsfuncs.cc index 6e2681c86150..6722dd9dd5b0 100644 --- a/winsup/cygwin/nlsfuncs.cc +++ b/winsup/cygwin/nlsfuncs.cc @@ -127,8 +127,17 @@ __get_rfc5646_from_locale (const char *name, wchar_t *= win_locale) c =3D wcschr (locale, '_'); if (!c) { - set_errno (ENOENT); - return -1; + /* 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) <=3D 0) + { + set_errno (ENOENT); + return -1; + } + wcpcpy (win_locale, wlocale); + return 1; } =20 /* Convert to RFC 5646 syntax. */