841f8331d
Denys Vlasenko
2014-08-13
Subject
ash,hush: run reinit_unicode() only if makes sense
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
shell/ash.c+3 -1
| @@ -9661,7 +9661,9 @@ preadfd(void) | |
| * _during_ shell execution, not only if it was set when | |
| * shell was started. Therefore, re-check LANG every time: | |
| */ | |
| - | { |
| + | if (ENABLE_FEATURE_CHECK_UNICODE_IN_ENV |
| + | || ENABLE_UNICODE_USING_LOCALE |
| + | ) { |
| const char *s = lookupvar("LC_ALL"); | |
| if (!s) s = lookupvar("LC_CTYPE"); | |
| if (!s) s = lookupvar("LANG"); | |
shell/hush.c+8 -4
| @@ -1985,10 +1985,14 @@ static void reinit_unicode_for_hush(void) | |
| * _during_ shell execution, not only if it was set when | |
| * shell was started. Therefore, re-check LANG every time: | |
| */ | |
| - | const char *s = get_local_var_value("LC_ALL"); |
| - | if (!s) s = get_local_var_value("LC_CTYPE"); |
| - | if (!s) s = get_local_var_value("LANG"); |
| - | reinit_unicode(s); |
| + | if (ENABLE_FEATURE_CHECK_UNICODE_IN_ENV |
| + | || ENABLE_UNICODE_USING_LOCALE |
| + | ) { |
| + | const char *s = get_local_var_value("LC_ALL"); |
| + | if (!s) s = get_local_var_value("LC_CTYPE"); |
| + | if (!s) s = get_local_var_value("LANG"); |
| + | reinit_unicode(s); |
| + | } |
| } | |