From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 18D9F3858409; Sat, 25 Mar 2023 21:51:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 18D9F3858409 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1679781095; bh=xVnITqAI4T7mKVtfOQIc2N7OiXbFPQWP9jq515G/ku0=; h=From:To:Subject:Date:From; b=KxpEI9+gvGtlxPPfJkjIQrTikm8p4gK/uX1ZIKgUMko3aaCgOtcfTGRpjEO4IQFmv U1eOe0ApmrIWS7hS/EpZOGcW2CsuxuiwgWRXwb2qQXWE/iKFSdV2APUvMTbyVozX0P E+xn1gjajv5mAcR91lWpxU8/WIjHky+o5/3EHsNk= 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: fix return value check of ResolveLocaleName X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/main X-Git-Oldrev: 7002f7f7c7d15f81444f00b0f606c750a9edfc53 X-Git-Newrev: a97fbb58e209586f92381e90aaec8fb211287938 Message-Id: <20230325215135.18D9F3858409@sourceware.org> Date: Sat, 25 Mar 2023 21:51:35 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3Da97fbb58e20= 9586f92381e90aaec8fb211287938 commit a97fbb58e209586f92381e90aaec8fb211287938 Author: Corinna Vinschen AuthorDate: Sat Mar 25 22:48:00 2023 +0100 Commit: Corinna Vinschen CommitDate: Sat Mar 25 22:48:35 2023 +0100 Cygwin: locales: fix return value check of ResolveLocaleName =20 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. =20 Signed-off-by: Corinna Vinschen 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 *w= in_locale) fix up Linux-only locale first */ if (!wcscmp (locale, L"ber")) wcscpy (locale, L"tzm"); - if (ResolveLocaleName (locale, wlocale, ENCODING_LEN + 1) <=3D 0) + if (ResolveLocaleName (locale, wlocale, ENCODING_LEN + 1) <=3D 1) { set_errno (ENOENT); return -1;