From f8972cd9e8418b04615669e9b8656cd32f4ed00c Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Tue, 28 Sep 2010 18:05:26 +0200 Subject: [PATCH] gettext.c: use libcharset.h instead of langinfo.h when available MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change the git_setup_gettext function to use libcharset to query the character set of the current locale if it's available. I.e. use it instead of nl_langinfo if HAVE_LIBCHARSET_H is set. The GNU gettext manual recommends using langinfo.h's nl_langinfo(CODESET) to acquire the current character set, but on systems that have libcharset.h's locale_charset() using the latter is either saner, or the only option on those systems. GNU and Solaris have a nl_langinfo(CODESET), FreeBSD can use either, but MinGW and some others need to use libcharset.h's locale_charset() instead. The locale_charset function returns a `const char*', instead of `char*` as nl_langinfo does. Change the declaration of the variable we're using to store the `charset' in `git_setup_gettext' accordingly. Signed-off-by: Erik Faye-Lund Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile | 17 +++++++++++++++++ config.mak.in | 1 + configure.ac | 6 ++++++ gettext.c | 10 +++++++++- 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0b2654527..2d6d8242d 100644 --- a/Makefile +++ b/Makefile @@ -43,6 +43,12 @@ all:: # on platforms where we don't expect glibc (Linux, Hurd, # GNU/kFreeBSD), which includes libintl. # +# Define HAVE_LIBCHARSET_H if you haven't set NO_GETTEXT and you can't +# trust the langinfo.h's nl_langinfo(CODESET) function to return the +# current character set. GNU and Solaris have a nl_langinfo(CODESET), +# FreeBSD can use either, but MinGW and some others need to use +# libcharset.h's locale_charset() instead. +# # Define EXPATDIR=/foo/bar if your expat header and library files are in # /foo/bar/include and /foo/bar/lib directories. # @@ -784,6 +790,10 @@ EXTLIBS = ifndef NO_GETTEXT # Systems that use GNU gettext and glibc are the exception NEEDS_LIBINTL = YesPlease + + # Since we assume a GNU gettext by default we also assume a + # GNU-like langinfo.h by default + HAVE_LIBCHARSET_H = endif # We choose to avoid "if .. else if .. else .. endif endif" @@ -1170,6 +1180,9 @@ ifneq (,$(wildcard ../THIS_IS_MSYSGIT)) EXTLIBS += /mingw/lib/libz.a NO_R_TO_GCC_LINKER = YesPlease INTERNAL_QSORT = YesPlease +ifndef NO_GETTEXT + HAVE_LIBCHARSET_H = YesPlease +endif else NO_CURL = YesPlease endif @@ -1949,6 +1962,10 @@ attr.s attr.o: EXTRA_CPPFLAGS = -DETC_GITATTRIBUTES='"$(ETC_GITATTRIBUTES_SQ)"' http.s http.o: EXTRA_CPPFLAGS = -DGIT_HTTP_USER_AGENT='"git/$(GIT_VERSION)"' +ifdef HAVE_LIBCHARSET_H +gettext.s gettext.o: EXTRA_CPPFLAGS = -DHAVE_LIBCHARSET_H +endif + ifdef NO_EXPAT http-walker.s http-walker.o: EXTRA_CPPFLAGS = -DNO_EXPAT endif diff --git a/config.mak.in b/config.mak.in index 9f47aa5e1..969cbaa02 100644 --- a/config.mak.in +++ b/config.mak.in @@ -34,6 +34,7 @@ NO_CURL=@NO_CURL@ NO_EXPAT=@NO_EXPAT@ NO_LIBGEN_H=@NO_LIBGEN_H@ HAVE_PATHS_H=@HAVE_PATHS_H@ +HAVE_LIBCHARSET_H=@HAVE_LIBCHARSET_H@ NO_GETTEXT=@NO_GETTEXT@ NEEDS_LIBICONV=@NEEDS_LIBICONV@ NEEDS_SOCKET=@NEEDS_SOCKET@ diff --git a/configure.ac b/configure.ac index 28c2c37dc..9074cc96e 100644 --- a/configure.ac +++ b/configure.ac @@ -818,6 +818,12 @@ AC_CHECK_HEADER([libintl.h], [NO_GETTEXT=YesPlease]) AC_SUBST(NO_GETTEXT) # +# Define HAVE_LIBCHARSET_H if have libcharset.h +AC_CHECK_HEADER([libcharset.h], +[HAVE_LIBCHARSET_H=YesPlease], +[HAVE_LIBCHARSET_H=]) +AC_SUBST(HAVE_LIBCHARSET_H) +# # Define NO_STRCASESTR if you don't have strcasestr. GIT_CHECK_FUNC(strcasestr, [NO_STRCASESTR=], diff --git a/gettext.c b/gettext.c index 8644098b5..9bdac5693 100644 --- a/gettext.c +++ b/gettext.c @@ -1,13 +1,17 @@ #include "exec_cmd.h" #include #include +#ifdef HAVE_LIBCHARSET_H +#include +#else #include +#endif #include extern void git_setup_gettext(void) { char *podir; char *envdir = getenv("GIT_TEXTDOMAINDIR"); - char *charset; + const char *charset; if (envdir) { (void)bindtextdomain("git", envdir); @@ -20,7 +24,11 @@ extern void git_setup_gettext(void) { (void)setlocale(LC_MESSAGES, ""); (void)setlocale(LC_CTYPE, ""); +#ifdef HAVE_LIBCHARSET_H + charset = locale_charset(); +#else charset = nl_langinfo(CODESET); +#endif (void)bind_textdomain_codeset("git", charset); (void)setlocale(LC_CTYPE, "C"); (void)textdomain("git"); -- 2.30.2