From 3e7ecb179b193bf17323c975890eed1d025f7e4c Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 2 Jul 2013 17:30:23 +0200 Subject: unicode: check $LC_ALL to detect Unicode mode, not only $LANG Signed-off-by: Denys Vlasenko --- libbb/unicode.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'libbb') diff --git a/libbb/unicode.c b/libbb/unicode.c index 99dc1df..c1e3966 100644 --- a/libbb/unicode.c +++ b/libbb/unicode.c @@ -39,8 +39,11 @@ void FAST_FUNC reinit_unicode(const char *LANG) void FAST_FUNC init_unicode(void) { - if (unicode_status == UNICODE_UNKNOWN) - reinit_unicode(getenv("LANG")); + if (unicode_status == UNICODE_UNKNOWN) { + char *s = getenv("LC_ALL"); + if (!s) s = getenv("LANG"); + reinit_unicode(s); + } } #else @@ -58,8 +61,11 @@ void FAST_FUNC reinit_unicode(const char *LANG) void FAST_FUNC init_unicode(void) { - if (unicode_status == UNICODE_UNKNOWN) - reinit_unicode(getenv("LANG")); + if (unicode_status == UNICODE_UNKNOWN) { + char *s = getenv("LC_ALL"); + if (!s) s = getenv("LANG"); + reinit_unicode(s); + } } # endif -- cgit v1.1