From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 0CA223858CDA; Fri, 24 Mar 2023 11:52:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0CA223858CDA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1679658737; bh=5F1Svu22JWV/kyIYOm1InmlU2B09BkxywCG4G2Q/dtc=; h=From:To:Subject:Date:From; b=M+LDDLiOej6JJtINvaCkOr4OJVCLRHgh2QUkZWzAqsI0e96yKeAhn9Qxxzs8sw/31 GWrJXFLAfylwcD2EHs8uk4c1zZaDDfHnfTlbTK7GE3zugqYcH3uKZAG655gFf029ly qMOEnc2dPneociRQnOAD1qc7IiDIKuK1gE5z6GNY= 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] 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: c53d0910e611bf4cf61f8f8cb44c6ce70d3e9a05 X-Git-Newrev: 15898b95881b1fa504e671e0bcfd653b242effa8 Message-Id: <20230324115217.0CA223858CDA@sourceware.org> Date: Fri, 24 Mar 2023 11:52:17 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D15898b95881= b1fa504e671e0bcfd653b242effa8 commit 15898b95881b1fa504e671e0bcfd653b242effa8 Author: Corinna Vinschen AuthorDate: Fri Mar 24 12:43:30 2023 +0100 Commit: Corinna Vinschen CommitDate: Fri Mar 24 12:50:59 2023 +0100 Cygwin: locales: drop supporting iso639 strings as valid locales =20 This was incorrect behaviour. The only valid way to support those is by adding them to /usr/share/locale/locale.alias. =20 Fixes: e95a7a795522 ("Cygwin: convert Windows locale handling from LCID= to ISO5646 strings") Signed-off-by: Corinna Vinschen 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 *wi= n_locale) c =3D 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) <=3D 0) - { - set_errno (ENOENT); - return -1; - } - wcpcpy (win_locale, wlocale); - return 1; + set_errno (ENOENT); + return -1; } =20 /* Convert to RFC 5646 syntax. */