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: fix return value check of ResolveLocaleName
Date: Sat, 25 Mar 2023 21:51:35 +0000 (GMT)	[thread overview]
Message-ID: <20230325215135.18D9F3858409@sourceware.org> (raw)

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

commit a97fbb58e209586f92381e90aaec8fb211287938
Author:     Corinna Vinschen <corinna@vinschen.de>
AuthorDate: Sat Mar 25 22:48:00 2023 +0100
Commit:     Corinna Vinschen <corinna@vinschen.de>
CommitDate: Sat Mar 25 22:48:35 2023 +0100

    Cygwin: locales: fix return value check of ResolveLocaleName
    
    ResolveLocaleName does not simply return an error value if it
    can't resolve a locale.  Rather, it returns an empty string and
    the length of this string: 1.
    
    Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

Diff:
---
 winsup/cygwin/nlsfuncs.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/winsup/cygwin/nlsfuncs.cc b/winsup/cygwin/nlsfuncs.cc
index 6722dd9dd5b0..ee44de03e5f6 100644
--- a/winsup/cygwin/nlsfuncs.cc
+++ b/winsup/cygwin/nlsfuncs.cc
@@ -131,7 +131,7 @@ __get_rfc5646_from_locale (const char *name, wchar_t *win_locale)
          fix up Linux-only locale first */
       if (!wcscmp (locale, L"ber"))
 	wcscpy (locale, L"tzm");
-      if (ResolveLocaleName (locale, wlocale, ENCODING_LEN + 1) <= 0)
+      if (ResolveLocaleName (locale, wlocale, ENCODING_LEN + 1) <= 1)
 	{
 	  set_errno (ENOENT);
 	  return -1;

                 reply	other threads:[~2023-03-25 21:51 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=20230325215135.18D9F3858409@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: link
Be 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).