public inbox for cygwin-cvs@sourceware.org help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org> To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin/main] Cygwin: locales: drop supporting iso639 strings as valid locales Date: Fri, 24 Mar 2023 11:52:17 +0000 (GMT) [thread overview] Message-ID: <20230324115217.0CA223858CDA@sourceware.org> (raw) 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. */
reply other threads:[~2023-03-24 11:52 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230324115217.0CA223858CDA@sourceware.org \ --to=corinna@sourceware.org \ --cc=cygwin-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).