From f9ad57b0d32ef5033a9281b720ae6d8c54855b63 Mon Sep 17 00:00:00 2001 From: Tatsuya Kinoshita Date: Sun, 13 Oct 2013 09:47:34 +0900 Subject: Do not fail when LANG is not set Check whether the value of LC_ALL, LC_CTYPE or LANG is not NULL in check_cygwin_console(). Bug: https://sourceforge.net/p/w3m/patches/66/ --- terms.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/terms.c b/terms.c index 7a3c987..4bb46c0 100644 --- a/terms.c +++ b/terms.c @@ -222,6 +222,7 @@ static void check_cygwin_console(void) { char *term = getenv("TERM"); + char *ctype; HANDLE hWnd; if (term == NULL) @@ -236,7 +237,9 @@ check_cygwin_console(void) isLocalConsole = 1; } } - if (strncmp(getenv("LANG"), "ja", 2) == 0) { + if ((ctype = getenv("LC_ALL") || + ctype = getenv("LC_CTYPE") || + ctype = getenv("LANG")) && strncmp(ctype, "ja", 2) == 0) { isWinConsole = TERM_CYGWIN_RESERVE_IME; } #ifdef SUPPORT_WIN9X_CONSOLE_MBCS -- cgit v1.2.3