diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2013-07-02 17:30:23 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2013-07-02 17:30:23 +0200 |
| commit | 3e7ecb179b193bf17323c975890eed1d025f7e4c (patch) | |
| tree | 99b869b4f6fa759aacb2c8e12464797c9e930a3d /libbb | |
| parent | ea267d518ff55517e174b9e8514fc521e4a3b41e (diff) | |
| download | busybox-w32-3e7ecb179b193bf17323c975890eed1d025f7e4c.tar.gz busybox-w32-3e7ecb179b193bf17323c975890eed1d025f7e4c.tar.bz2 busybox-w32-3e7ecb179b193bf17323c975890eed1d025f7e4c.zip | |
unicode: check $LC_ALL to detect Unicode mode, not only $LANG
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/unicode.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/libbb/unicode.c b/libbb/unicode.c index 99dc1dfa6..c1e3966fe 100644 --- a/libbb/unicode.c +++ b/libbb/unicode.c | |||
| @@ -39,8 +39,11 @@ void FAST_FUNC reinit_unicode(const char *LANG) | |||
| 39 | 39 | ||
| 40 | void FAST_FUNC init_unicode(void) | 40 | void FAST_FUNC init_unicode(void) |
| 41 | { | 41 | { |
| 42 | if (unicode_status == UNICODE_UNKNOWN) | 42 | if (unicode_status == UNICODE_UNKNOWN) { |
| 43 | reinit_unicode(getenv("LANG")); | 43 | char *s = getenv("LC_ALL"); |
| 44 | if (!s) s = getenv("LANG"); | ||
| 45 | reinit_unicode(s); | ||
| 46 | } | ||
| 44 | } | 47 | } |
| 45 | 48 | ||
| 46 | #else | 49 | #else |
| @@ -58,8 +61,11 @@ void FAST_FUNC reinit_unicode(const char *LANG) | |||
| 58 | 61 | ||
| 59 | void FAST_FUNC init_unicode(void) | 62 | void FAST_FUNC init_unicode(void) |
| 60 | { | 63 | { |
| 61 | if (unicode_status == UNICODE_UNKNOWN) | 64 | if (unicode_status == UNICODE_UNKNOWN) { |
| 62 | reinit_unicode(getenv("LANG")); | 65 | char *s = getenv("LC_ALL"); |
| 66 | if (!s) s = getenv("LANG"); | ||
| 67 | reinit_unicode(s); | ||
| 68 | } | ||
| 63 | } | 69 | } |
| 64 | # endif | 70 | # endif |
| 65 | 71 | ||