diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2013-07-02 17:30:23 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2013-07-02 17:30:23 +0200 |
commit | 3e7ecb179b193bf17323c975890eed1d025f7e4c (patch) | |
tree | 99b869b4f6fa759aacb2c8e12464797c9e930a3d /shell/hush.c | |
parent | ea267d518ff55517e174b9e8514fc521e4a3b41e (diff) | |
download | busybox-w32-3e7ecb179b193bf17323c975890eed1d025f7e4c.tar.gz busybox-w32-3e7ecb179b193bf17323c975890eed1d025f7e4c.tar.bz2 busybox-w32-3e7ecb179b193bf17323c975890eed1d025f7e4c.zip |
unicode: check $LC_ALL to detect Unicode mode, not only $LANG
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell/hush.c')
-rw-r--r-- | shell/hush.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/shell/hush.c b/shell/hush.c index 1a2603e3b..1fa84dc4f 100644 --- a/shell/hush.c +++ b/shell/hush.c | |||
@@ -2044,7 +2044,9 @@ static void get_user_input(struct in_str *i) | |||
2044 | * _during_ shell execution, not only if it was set when | 2044 | * _during_ shell execution, not only if it was set when |
2045 | * shell was started. Therefore, re-check LANG every time: | 2045 | * shell was started. Therefore, re-check LANG every time: |
2046 | */ | 2046 | */ |
2047 | reinit_unicode(get_local_var_value("LANG")); | 2047 | const char *s = get_local_var_value("LC_ALL"); |
2048 | if (!s) s = get_local_var_value("LANG"); | ||
2049 | reinit_unicode(s); | ||
2048 | 2050 | ||
2049 | G.flag_SIGINT = 0; | 2051 | G.flag_SIGINT = 0; |
2050 | /* buglet: SIGINT will not make new prompt to appear _at once_, | 2052 | /* buglet: SIGINT will not make new prompt to appear _at once_, |