Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/libbb/unicode.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/libbb/unicode.c (modified) (4 diffs)

branches/3.2/mindi-busybox/libbb/unicode.c

@@ -24 +24 @@
 /* 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
@@ -37 +38 @@
 }
 
+void FAST_FUNC init_unicode(void)
+{
+    if (unicode_status == UNICODE_UNKNOWN)
+        reinit_unicode(getenv("LANG"));
+}
+
 #else
 
@@ -42 +49 @@
 
 # if ENABLE_FEATURE_CHECK_UNICODE_IN_ENV
-void FAST_FUNC init_unicode(void)
-{
-    char *lang;
-
-    if (unicode_status != UNICODE_UNKNOWN)
-        return;
-
+void FAST_FUNC reinit_unicode(const char *LANG)
+{
     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
@@ -1108 +1115 @@
     return unicode_conv_to_printable2(stats, src, INT_MAX, 0);
 }
+char* FAST_FUNC unicode_conv_to_printable_fixedwidth(/*uni_stat_t *stats,*/ const char *src, unsigned width)
+{
+    return unicode_conv_to_printable2(/*stats:*/ NULL, src, width, UNI_FLAG_PAD);
+}
+
+#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, maxwidth, 0);
 }
-char* FAST_FUNC unicode_conv_to_printable_fixedwidth(uni_stat_t *stats, const char *src, unsigned width)
-{
-    return unicode_conv_to_printable2(stats, src, width, UNI_FLAG_PAD);
-}
-
-#ifdef UNUSED
+
 unsigned FAST_FUNC unicode_padding_to_width(unsigned width, const char *src)
 {