From 2301d127a2676303eac563e7932c03d9d72c446e Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 5 Jul 2013 22:00:57 +0200 Subject: unicode: check $LC_CTYPE too to detect Unicode mode Signed-off-by: Denys Vlasenko --- shell/ash.c | 1 + shell/hush.c | 1 + 2 files changed, 2 insertions(+) (limited to 'shell') diff --git a/shell/ash.c b/shell/ash.c index 90f222467..d696bbdac 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -9659,6 +9659,7 @@ preadfd(void) */ { const char *s = lookupvar("LC_ALL"); + if (!s) s = lookupvar("LC_CTYPE"); if (!s) s = lookupvar("LANG"); reinit_unicode(s); } diff --git a/shell/hush.c b/shell/hush.c index 1fa84dc4f..fc9b89b55 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -2045,6 +2045,7 @@ static void get_user_input(struct in_str *i) * 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); -- cgit v1.2.3