3e7ecb179
Denys Vlasenko
2013-07-02
Subject
unicode: check $LC_ALL to detect Unicode mode, not only $LANG
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
libbb/unicode.c+10 -4
| @@ -39,8 +39,11 @@ void FAST_FUNC reinit_unicode(const char *LANG) | |
| void FAST_FUNC init_unicode(void) | |
| { | |
| - | if (unicode_status == UNICODE_UNKNOWN) |
| - | reinit_unicode(getenv("LANG")); |
| + | if (unicode_status == UNICODE_UNKNOWN) { |
| + | char *s = getenv("LC_ALL"); |
| + | if (!s) s = getenv("LANG"); |
| + | reinit_unicode(s); |
| + | } |
| } | |
| #else | |
| @@ -58,8 +61,11 @@ void FAST_FUNC reinit_unicode(const char *LANG) | |
| void FAST_FUNC init_unicode(void) | |
| { | |
| - | if (unicode_status == UNICODE_UNKNOWN) |
| - | reinit_unicode(getenv("LANG")); |
| + | if (unicode_status == UNICODE_UNKNOWN) { |
| + | char *s = getenv("LC_ALL"); |
| + | if (!s) s = getenv("LANG"); |
| + | reinit_unicode(s); |
| + | } |
| } | |
| # endif | |
shell/ash.c+5 -1
| @@ -9657,7 +9657,11 @@ preadfd(void) | |
| * _during_ shell execution, not only if it was set when | |
| * shell was started. Therefore, re-check LANG every time: | |
| */ | |
| - | reinit_unicode(lookupvar("LANG")); |
| + | { |
| + | const char *s = lookupvar("LC_ALL"); |
| + | if (!s) s = lookupvar("LANG"); |
| + | reinit_unicode(s); |
| + | } |
| nr = read_line_input(line_input_state, cmdedit_prompt, buf, IBUFSIZ, timeout); | |
| if (nr == 0) { | |
| /* Ctrl+C pressed */ | |
shell/hush.c+3 -1
| @@ -2044,7 +2044,9 @@ static void get_user_input(struct in_str *i) | |
| * _during_ shell execution, not only if it was set when | |
| * shell was started. Therefore, re-check LANG every time: | |
| */ | |
| - | reinit_unicode(get_local_var_value("LANG")); |
| + | const char *s = get_local_var_value("LC_ALL"); |
| + | if (!s) s = get_local_var_value("LANG"); |
| + | reinit_unicode(s); |
| G.flag_SIGINT = 0; | |
| /* buglet: SIGINT will not make new prompt to appear _at once_, | |