udhcpc: fix a problem with binary-encoded options #2

[oweals/busybox.git] / libbb / unicode.c

diff --git a/libbb/unicode.c b/libbb/unicode.c
index cf0c6bed9754e97663d0fd216a63277de3de9825..99dc1dfa6afee28e7834b0f98fdd32a0ab79b6ac 100644 (file)
--- a/libbb/unicode.c
+++ b/libbb/unicode.c
@@ -23,37 +23,44 @@ uint8_t unicode_status;
 
 /* Unicode support using libc locale support. */
 
-void FAST_FUNC init_unicode(void)
+void FAST_FUNC reinit_unicode(const char *LANG)
 {
        static const char unicode_0x394[] = { 0xce, 0x94, 0 };
        size_t width;
 
-       if (unicode_status != UNICODE_UNKNOWN)
-               return;
+//TODO: avoid repeated calls by caching last string?
+       setlocale(LC_ALL, (LANG && LANG[0]) ? LANG : "C");
+
        /* In unicode, this is a one character string */
 // can use unicode_strlen(string) too, but otherwise unicode_strlen() is unused
        width = mbstowcs(NULL, unicode_0x394, INT_MAX);
        unicode_status = (width == 1 ? UNICODE_ON : UNICODE_OFF);
 }
 
+void FAST_FUNC init_unicode(void)
+{
+       if (unicode_status == UNICODE_UNKNOWN)
+               reinit_unicode(getenv("LANG"));
+}
+
 #else
 
 /* Homegrown Unicode support. It knows only C and Unicode locales. */
 
 # if ENABLE_FEATURE_CHECK_UNICODE_IN_ENV
-void FAST_FUNC init_unicode(void)
+void FAST_FUNC reinit_unicode(const char *LANG)
 {
-       char *lang;
-
-       if (unicode_status != UNICODE_UNKNOWN)
-               return;
-
        unicode_status = UNICODE_OFF;
-       lang = getenv("LANG");
-       if (!lang || !(strstr(lang, ".utf") || strstr(lang, ".UTF")))
+       if (!LANG || !(strstr(LANG, ".utf") || strstr(LANG, ".UTF")))
                return;
        unicode_status = UNICODE_ON;
 }
+
+void FAST_FUNC init_unicode(void)
+{
+       if (unicode_status == UNICODE_UNKNOWN)
+               reinit_unicode(getenv("LANG"));
+}
 # endif
 
 static size_t wcrtomb_internal(char *s, wchar_t wc)
@@ -1107,16 +1114,17 @@ char* FAST_FUNC unicode_conv_to_printable(uni_stat_t *stats, const char *src)
 {
        return unicode_conv_to_printable2(stats, src, INT_MAX, 0);
 }
-char* FAST_FUNC unicode_conv_to_printable_maxwidth(uni_stat_t *stats, const char *src, unsigned maxwidth)
+char* FAST_FUNC unicode_conv_to_printable_fixedwidth(/*uni_stat_t *stats,*/ const char *src, unsigned width)
 {
-       return unicode_conv_to_printable2(stats, src, maxwidth, 0);
+       return unicode_conv_to_printable2(/*stats:*/ NULL, src, width, UNI_FLAG_PAD);
 }
-char* FAST_FUNC unicode_conv_to_printable_fixedwidth(uni_stat_t *stats, const char *src, unsigned width)
+
+#ifdef UNUSED
+char* FAST_FUNC unicode_conv_to_printable_maxwidth(uni_stat_t *stats, const char *src, unsigned maxwidth)
 {
-       return unicode_conv_to_printable2(stats, src, width, UNI_FLAG_PAD);
+       return unicode_conv_to_printable2(stats, src, maxwidth, 0);
 }
 
-#ifdef UNUSED
 unsigned FAST_FUNC unicode_padding_to_width(unsigned width, const char *src)
 {
        if (unicode_status != UNICODE_ON) {