The main issue we work around here is that Windows does not have a UTF-8 "code page". Side note: there is actually a code page for UTF-8: 65001 (see https://docs.microsoft.com/en-us/windows/desktop/Intl/code-page-identifiers ). However, when experimenting with it, we ran into a multitude of issues in the Git for Windows project, ranging from various problems with Windows' default console to miscounted file writes. While these issues may have been mitigated in recent Windows 10 versions, older ones (in particular, Windows 7) still seem to have most of them, and Git for Windows specifically still supports even Windows Vista. So from a practical point of view, there is no UTF-8 code page. Changes since v1: * The LC_ALL=C method used by ab/no-kwset to prevent Git from assuming UTF-8-encoded input is now supported. * The commit message was enhanced and revamped. Karsten Blees (1): gettext: always use UTF-8 on native Windows gettext.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) base-commit: aa25c82427ae70aebf3b8f970f2afd54e9a2a8c6 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-217%2Fdscho%2Fgettext-force-utf-8-on-windows-v2 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-217/dscho/gettext-force-utf-8-on-windows-v2 Pull-Request: https://github.com/gitgitgadget/git/pull/217 Range-diff vs v1: 1: ff37a2646a ! 1: 2d2253faef gettext: always use UTF-8 on native Windows @@ -2,17 +2,34 @@ gettext: always use UTF-8 on native Windows - Git on native Windows exclusively uses UTF-8 for console output (both with - MinTTY and native Console windows). Gettext uses setlocale() to determine - the output encoding for translated text, however, MSVCRT's setlocale() - doesn't support UTF-8. As a result, translated text is encoded in system - encoding (GetAPC()), and non-ASCII chars are mangled in console output. + On native Windows, Git exclusively uses UTF-8 for console output (both + with MinTTY and native Win32 Console). Gettext uses `setlocale()` to + determine the output encoding for translated text, however, MSVCRT's + `setlocale()` does not support UTF-8. As a result, translated text is + encoded in system encoding (as per `GetAPC()`), and non-ASCII chars are + mangled in console output. - Use gettext's bind_textdomain_codeset() to force the encoding to UTF-8 on - native Windows. + Side note: There is actually a code page for UTF-8: 65001. In practice, + it does not work as expected at least on Windows 7, though, so we cannot + use it in Git. Besides, if we overrode the code page, any process + spawned from Git would inherit that code page (as opposed to the code + page configured for the current user), which would quite possibly break + e.g. diff or merge helpers. So we really cannot override the code page. - In this developers' setup, HAVE_LIBCHARSET_H is apparently defined, but - we *really* want to override the locale_charset() here. + In `init_gettext_charset()`, Git calls gettext's + `bind_textdomain_codeset()` with the character set obtained via + `locale_charset()`; Let's override that latter function to force the + encoding to UTF-8 on native Windows. + + In Git for Windows' SDK, there is a `libcharset.h` and therefore we + define `HAVE_LIBCHARSET_H` in the MINGW-specific section in + `config.mak.uname`, therefore we need to add the override before that + conditionally-compiled code block. + + Rather than simply defining `locale_charset()` to return the string + `"UTF-8"`, though, we are careful not to break `LC_ALL=C`: the + `ab/no-kwset` patch series, for example, needs to have a way to prevent + Git from expecting UTF-8-encoded input. Signed-off-by: Karsten Blees <blees@xxxxxxx> Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx> @@ -26,7 +43,23 @@ # include <libintl.h> -# ifdef HAVE_LIBCHARSET_H +# ifdef GIT_WINDOWS_NATIVE -+# define locale_charset() "UTF-8" ++ ++static const char *locale_charset(void) ++{ ++ const char *env = getenv("LC_ALL"), *dot; ++ ++ if (!env || !*env) ++ env = getenv("LC_CTYPE"); ++ if (!env || !*env) ++ env = getenv("LANG"); ++ ++ if (!env) ++ return "UTF-8"; ++ ++ dot = strchr(env, '.'); ++ return !dot ? env : dot + 1; ++} ++ +# elif defined HAVE_LIBCHARSET_H # include <libcharset.h> # else -- gitgitgadget
