summaryrefslogtreecommitdiff
path: root/shell/hush.c
diff options
context:
space:
mode:
authorDenys Vlasenko2013-07-02 17:30:23 +0200
committerDenys Vlasenko2013-07-02 17:30:23 +0200
commit3e7ecb179b193bf17323c975890eed1d025f7e4c (patch)
tree99b869b4f6fa759aacb2c8e12464797c9e930a3d /shell/hush.c
parentea267d518ff55517e174b9e8514fc521e4a3b41e (diff)
downloadbusybox-3e7ecb179b193bf17323c975890eed1d025f7e4c.zip
busybox-3e7ecb179b193bf17323c975890eed1d025f7e4c.tar.gz
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.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/shell/hush.c b/shell/hush.c
index 1a2603e..1fa84dc 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -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_,