aboutsummaryrefslogtreecommitdiff
path: root/shell/hush.c
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2014-08-13 10:09:49 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2014-08-13 10:09:49 +0200
commit841f8331d79c642b4268dae52c382fab2da9cddc (patch)
treee2d69ca863fc404669d78952b48561fde336431f /shell/hush.c
parentc538d5bcc304d1ac99783de2337937c70a7013c7 (diff)
downloadbusybox-w32-841f8331d79c642b4268dae52c382fab2da9cddc.tar.gz
busybox-w32-841f8331d79c642b4268dae52c382fab2da9cddc.tar.bz2
busybox-w32-841f8331d79c642b4268dae52c382fab2da9cddc.zip
ash,hush: run reinit_unicode() only if makes sense
With static Unicode support, no need to check $LANG et al. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell/hush.c')
-rw-r--r--shell/hush.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/shell/hush.c b/shell/hush.c
index 7d3547110..92d790180 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -1985,10 +1985,14 @@ static void reinit_unicode_for_hush(void)
1985 * _during_ shell execution, not only if it was set when 1985 * _during_ shell execution, not only if it was set when
1986 * shell was started. Therefore, re-check LANG every time: 1986 * shell was started. Therefore, re-check LANG every time:
1987 */ 1987 */
1988 const char *s = get_local_var_value("LC_ALL"); 1988 if (ENABLE_FEATURE_CHECK_UNICODE_IN_ENV
1989 if (!s) s = get_local_var_value("LC_CTYPE"); 1989 || ENABLE_UNICODE_USING_LOCALE
1990 if (!s) s = get_local_var_value("LANG"); 1990 ) {
1991 reinit_unicode(s); 1991 const char *s = get_local_var_value("LC_ALL");
1992 if (!s) s = get_local_var_value("LC_CTYPE");
1993 if (!s) s = get_local_var_value("LANG");
1994 reinit_unicode(s);
1995 }
1992} 1996}
1993 1997
1994 1998