emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Call setlocale("") , not "C", if we want to set the default one

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2013-07-07 14:41:58 +02:00
parent 2301d127a2
commit d8f6d8c627
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libbb/unicode.c
View File

@ -28,8 +28,19 @@ void FAST_FUNC reinit_unicode(const char *LANG)
static const char unicode_0x394[] = { 0xce, 0x94, 0 }; static const char unicode_0x394[] = { 0xce, 0x94, 0 };
size_t width; size_t width;
/* We pass "" instead of "C" because some libc's have
* non-ASCII default locale for setlocale("") call
* (this allows users of such libc to have Unicoded
* system without having to mess with env).
*
* We set LC_CTYPE because (a) we may be called with $LC_CTYPE
* value in LANG, not with $LC_ALL, (b) internationalized
* LC_NUMERIC and LC_TIME are more PITA than benefit
* (for one, some utilities have hard time with comma
* used as a fractional separator).
*/
//TODO: avoid repeated calls by caching last string? //TODO: avoid repeated calls by caching last string?
setlocale(LC_ALL, (LANG && LANG[0]) ? LANG : "C"); setlocale(LC_CTYPE, LANG ? LANG : "");
/* In unicode, this is a one character string */ /* In unicode, this is a one character string */
// can use unicode_strlen(string) too, but otherwise unicode_strlen() is unused // can use unicode_strlen(string) too, but otherwise unicode_strlen() is unused
@ -42,8 +53,6 @@ void FAST_FUNC init_unicode(void)
/* Some people set only $LC_CTYPE, not $LC_ALL, because they want /* Some people set only $LC_CTYPE, not $LC_ALL, because they want
* only Unicode to be activated on their system, not the whole * only Unicode to be activated on their system, not the whole
* shebang of wrong decimal points, strange date formats and so on. * shebang of wrong decimal points, strange date formats and so on.
*
* TODO? Maybe we should use LC_CTYPE instead of LC_ALL in setlocale()?
*/ */
if (unicode_status == UNICODE_UNKNOWN) { if (unicode_status == UNICODE_UNKNOWN) {
char *s = getenv("LC_ALL"); char *s = getenv("LC_ALL");