1 files changed, 13 insertions, 0 deletions

diff --git a/libbb/unicode.c b/libbb/unicode.c
index e98cbbf35..acc7cd8df 100644
--- a/libbb/unicode.c
+++ b/libbb/unicode.c
@@ -69,8 +69,14 @@ void FAST_FUNC init_unicode(void)
 void FAST_FUNC reinit_unicode(const char *LANG)
 {
         unicode_status = UNICODE_OFF;
+#if ENABLE_PLATFORM_MINGW32
+        /* enable unicode only when ACP is UTF8 and the env var is not 'C' */
+        if (GetACP() != CP_UTF8 || (LANG && LANG[0] == 'C' && LANG[1] == 0))
+                return;
+#else
         if (!LANG || !(strstr(LANG, ".utf") || strstr(LANG, ".UTF")))
                 return;
+#endif
         unicode_status = UNICODE_ON;
 }
 
@@ -270,7 +276,9 @@ int FAST_FUNC iswpunct(wint_t wc)
         return (unsigned)wc <= 0x7f && ispunct(wc);
 }
 
+#define WCWIDTH_ALT (ENABLE_PLATFORM_MINGW32 && CONFIG_LAST_SUPPORTED_WCHAR >= 0x30000)
 
+# if !WCWIDTH_ALT || ENABLE_UNICODE_BIDI_SUPPORT
 # if CONFIG_LAST_SUPPORTED_WCHAR >= 0x300
 struct interval {
         uint16_t first;
@@ -327,7 +335,9 @@ static int in_uint16_table(unsigned ucs, const uint16_t *table, unsigned max)
         return 0;
 }
 # endif
+# endif /* !WCWIDTH_ALT || ENABLE_UNICODE_BIDI_SUPPORT */
 
+# if !WCWIDTH_ALT
 
 /*
  * This is an implementation of wcwidth() and wcswidth() (defined in
@@ -697,6 +707,9 @@ int FAST_FUNC wcwidth(unsigned ucs)
 # endif /* >= 0x300 */
 }
 
+# else /* WCWIDTH_ALT */
+# include "wcwidth_alt.c"  /* simpler and more up-to-date implementation */
+# endif
 
 # if ENABLE_UNICODE_BIDI_SUPPORT
 int FAST_FUNC unicode_bidi_isrtl(wint_t wc)