From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH v2 08/12] gettext: add is_utf8_locale()
Date: Sat, 25 Jun 2016 07:22:34 +0200 [thread overview]
Message-ID: <20160625052238.13615-9-pclouds@gmail.com> (raw)
In-Reply-To: <20160625052238.13615-1-pclouds@gmail.com>
This function returns true if git is running under an UTF-8
locale. pcre in the next patch will need this.
is_encoding_utf8() is used instead of strcmp() to catch both "utf-8"
and "utf8" suffixes.
When built with no gettext support, we peek in several env variables
to detect UTF-8. pcre library might support utf-8 even if libc is
built without locale support.. The peeking code is a copy from
compat/regex/regcomp.c
Helped-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
gettext.c | 24 ++++++++++++++++++++++--
gettext.h | 1 +
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/gettext.c b/gettext.c
index a268a2c..db727ea 100644
--- a/gettext.c
+++ b/gettext.c
@@ -18,6 +18,8 @@
# endif
#endif
+static const char *charset;
+
/*
* Guess the user's preferred languages from the value in LANGUAGE environment
* variable and LC_MESSAGES locale category if NO_GETTEXT is not defined.
@@ -65,7 +67,6 @@ static int test_vsnprintf(const char *fmt, ...)
return ret;
}
-static const char *charset;
static void init_gettext_charset(const char *domain)
{
/*
@@ -172,8 +173,27 @@ int gettext_width(const char *s)
{
static int is_utf8 = -1;
if (is_utf8 == -1)
- is_utf8 = !strcmp(charset, "UTF-8");
+ is_utf8 = is_utf8_locale();
return is_utf8 ? utf8_strwidth(s) : strlen(s);
}
#endif
+
+int is_utf8_locale(void)
+{
+#ifdef NO_GETTEXT
+ if (!charset) {
+ const char *env = getenv("LC_ALL");
+ if (!env || !*env)
+ env = getenv("LC_CTYPE");
+ if (!env || !*env)
+ env = getenv("LANG");
+ if (!env)
+ env = "";
+ if (strchr(env, '.'))
+ env = strchr(env, '.') + 1;
+ charset = xstrdup(env);
+ }
+#endif
+ return is_encoding_utf8(charset);
+}
diff --git a/gettext.h b/gettext.h
index 33696a4..7eee64a 100644
--- a/gettext.h
+++ b/gettext.h
@@ -90,5 +90,6 @@ const char *Q_(const char *msgid, const char *plu, unsigned long n)
#endif
const char *get_preferred_languages(void);
+extern int is_utf8_locale(void);
#endif
--
2.8.2.526.g02eed6d
next prev parent reply other threads:[~2016-06-25 5:24 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-23 16:28 [PATCH 00/11] nd/icase updates Nguyễn Thái Ngọc Duy
2016-06-23 16:28 ` [PATCH 01/11] grep: break down an "if" stmt in preparation for next changes Nguyễn Thái Ngọc Duy
2016-06-23 16:28 ` [PATCH 02/11] test-regex: isolate the bug test code Nguyễn Thái Ngọc Duy
2016-06-23 16:28 ` [PATCH 03/11] test-regex: expose full regcomp() to the command line Nguyễn Thái Ngọc Duy
2016-06-23 16:29 ` [PATCH 04/11] grep/icase: avoid kwsset on literal non-ascii strings Nguyễn Thái Ngọc Duy
2016-06-23 20:12 ` Junio C Hamano
2016-06-23 16:29 ` [PATCH 05/11] grep/icase: avoid kwsset when -F is specified Nguyễn Thái Ngọc Duy
2016-06-23 20:25 ` Junio C Hamano
2016-06-23 16:29 ` [PATCH 06/11] grep/pcre: prepare locale-dependent tables for icase matching Nguyễn Thái Ngọc Duy
2016-06-23 16:29 ` [PATCH 07/11] gettext: add is_utf8_locale() Nguyễn Thái Ngọc Duy
2016-06-23 16:29 ` [PATCH 08/11] grep/pcre: support utf-8 Nguyễn Thái Ngọc Duy
2016-06-23 16:29 ` [PATCH 09/11] diffcore-pickaxe: "share" regex error handling code Nguyễn Thái Ngọc Duy
2016-06-23 19:16 ` Jeff King
2016-06-23 16:29 ` [PATCH 10/11] diffcore-pickaxe: support case insensitive match on non-ascii Nguyễn Thái Ngọc Duy
2016-06-23 16:29 ` [PATCH 11/11] grep.c: reuse "icase" variable Nguyễn Thái Ngọc Duy
2016-06-23 20:32 ` [PATCH 00/11] nd/icase updates Junio C Hamano
2016-06-25 5:22 ` [PATCH v2 00/12] " Nguyễn Thái Ngọc Duy
2016-06-25 5:22 ` [PATCH v2 01/12] grep: break down an "if" stmt in preparation for next changes Nguyễn Thái Ngọc Duy
2016-06-25 5:22 ` [PATCH v2 02/12] test-regex: isolate the bug test code Nguyễn Thái Ngọc Duy
2016-06-25 5:22 ` [PATCH v2 03/12] test-regex: expose full regcomp() to the command line Nguyễn Thái Ngọc Duy
2016-06-25 5:22 ` [PATCH v2 04/12] grep/icase: avoid kwsset on literal non-ascii strings Nguyễn Thái Ngọc Duy
2016-06-25 5:22 ` [PATCH v2 05/12] grep/icase: avoid kwsset when -F is specified Nguyễn Thái Ngọc Duy
2016-06-25 5:22 ` [PATCH v2 06/12] grep: rewrite an if/else condition to avoid duplicate expression Nguyễn Thái Ngọc Duy
2016-06-25 5:22 ` [PATCH v2 07/12] grep/pcre: prepare locale-dependent tables for icase matching Nguyễn Thái Ngọc Duy
2016-06-25 5:22 ` Nguyễn Thái Ngọc Duy [this message]
2016-06-25 5:22 ` [PATCH v2 09/12] grep/pcre: support utf-8 Nguyễn Thái Ngọc Duy
2016-06-25 5:22 ` [PATCH v2 10/12] diffcore-pickaxe: Add regcomp_or_die() Nguyễn Thái Ngọc Duy
2016-06-25 5:22 ` [PATCH v2 11/12] diffcore-pickaxe: support case insensitive match on non-ascii Nguyễn Thái Ngọc Duy
2016-06-25 5:22 ` [PATCH v2 12/12] grep.c: reuse "icase" variable Nguyễn Thái Ngọc Duy
2016-06-27 14:53 ` [PATCH v2 00/12] nd/icase updates Junio C Hamano
2016-06-27 15:00 ` Junio C Hamano
2016-06-30 15:45 ` Duy Nguyen
2016-07-01 18:18 ` Junio C Hamano
2016-07-01 18:46 ` Duy Nguyen
2016-07-01 18:54 ` Junio C Hamano
2016-07-01 19:11 ` Junio C Hamano
2016-07-01 19:40 ` Junio C Hamano
2016-07-01 20:06 ` Junio C Hamano
2016-07-01 20:07 ` Junio C Hamano
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=20160625052238.13615-9-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.