ahp/busybox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

unicode: check $LC_ALL to detect Unicode mode, not only $LANG

Browse source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2013-07-02 17:30:23 +02:00
parent ea267d518f
commit 3e7ecb179b
3 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libbb/unicode.c
View file

@ -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