From: Bruno Haible <bruno@clisp.org>
Date: Tue, 12 Dec 2023 08:45:16 +0000 (+0100)
Subject: intl: Treat C.UTF-8 locale like C locale, part 2 (BZ# 16621)
X-Git-Tag: glibc-2.39~210
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d0aefec49941cf6d97e2244d6aa20bafc26d5942;p=thirdparty%2Fglibc.git

intl: Treat C.UTF-8 locale like C locale, part 2 (BZ# 16621)

The previous commit was incomplete: gettext() still returns a translation
if the file /usr/share/locale/C/LC_MESSAGES/<domain>.mo exists. This patch
prohibits the translation also in this case.

* gettext-runtime/intl/dcigettext.c (DCIGETTEXT): Treat C.<encoding> locale
like the C locale.

Reviewed-by: Florian Weimer <fweimer@redhat.com>
---

diff --git a/intl/dcigettext.c b/intl/dcigettext.c
index 27063886d2e..fb69bbf94b0 100644
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
@@ -691,9 +691,10 @@ DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
 	    continue;
 	}
 
-      /* If the current locale value is C (or POSIX) we don't load a
-	 domain.  Return the MSGID.  */
-      if (strcmp (single_locale, "C") == 0
+      /* If the current locale value is "C" or "C.<encoding>" or "POSIX",
+	 we don't load a domain.  Return the MSGID.  */
+      if ((single_locale[0] == 'C'
+	   && (single_locale[1] == '\0' || single_locale[1] == '.'))
 	  || strcmp (single_locale, "POSIX") == 0)
 	break;