[newlib-cygwin/main] Cygwin: locales: fix return value check of ResolveLocaleName

Corinna Vinschen corinna@sourceware.org
Sat Mar 25 21:51:35 GMT 2023


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;


More information about the Cygwin-cvs mailing list