From fa549dd3869ebb9218de480f4048ce3b4e3bfe16 Mon Sep 17 00:00:00 2001
From: Karl Williamson <khw@cpan.org>
Date: Fri, 23 Apr 2021 08:34:16 -0600
Subject: [PATCH] 42

---
 lib/locale_threads.t |  4 ++++
 locale.c             | 52 +++++++++++++++++++++++++++++++++++++++++++-
 t/loc_tools.pl       |  2 +-
 3 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/lib/locale_threads.t b/lib/locale_threads.t
index f405a2886a47..9cc48d629d20 100644
--- a/lib/locale_threads.t
+++ b/lib/locale_threads.t
@@ -30,10 +30,14 @@ $debug = 1 if 0 && $^O =~ /MSWin32/i;
 my $d = $^D;
 $d |= 0x04000000|0x00100000 if $^O =~ /MSWin32/i; #if $debug;
 if ($^O =~ /MSWin32/i) {
+    local $^D = $d;
     print STDERR setlocale(&POSIX::LC_ALL, "Albanian"), "\n";
     print STDERR Dumper localeconv();
+    print STDERR setlocale(&POSIX::LC_CTYPE, "tr"), "\n";
+    print STDERR Dumper localeconv();
     print STDERR setlocale(&POSIX::LC_ALL, "tr"), "\n";
     print STDERR Dumper localeconv();
+    print STDERR setlocale(&POSIX::LC_ALL, "C"), "\n";
 }
 
 my $thread_count = $^O =~ /linux/i ? 50 : 3;
diff --git a/locale.c b/locale.c
index 2277887fee7b..e846ce6fdc27 100644
--- a/locale.c
+++ b/locale.c
@@ -2165,7 +2165,7 @@ S_new_ctype(pTHX_ const char *newctype)
                 bool is_bad = FALSE;
                 char name[4] = { '\0' };
 
-                /* Convert the name into a string */
+                /* XXX don't do this unless needed.  Convert the name into a string */
                 if (isGRAPH_A(i)) {
                     name[0] = i;
                     name[1] = '\0';
@@ -4443,6 +4443,56 @@ S_my_langinfo_i(pTHX_
                 mbtowc_ret = Perl_mbtowc_(aTHX_ &wc,
                                       STR_WITH_LEN(REPLACEMENT_CHARACTER_UTF8));
                 if (mbtowc_ret >= 0 && wc == UNICODE_REPLACEMENT) {
+                    unsigned int i;
+                    for (i = 128; i < 256; i++) {
+                        if (UNLIKELY(cBOOL(iswalnum(i)) != cBOOL(isALPHANUMERIC_L1(i))))  {
+                            DEBUG_L(PerlIO_printf(Perl_debug_log,
+                                                "iswalnum(%x) unexpectedly is %x\n",
+                                                i, cBOOL(iswalnum(i))));
+                        }
+                        if (UNLIKELY(cBOOL(iswcntrl(i)) != cBOOL(isCNTRL_L1(i))))  {
+                            DEBUG_L(PerlIO_printf(Perl_debug_log,
+                                                "iswcntrl(%x) unexpectedly is %x\n",
+                                                i, cBOOL(iswcntrl(i))));
+                        }
+                        if (UNLIKELY(cBOOL(iswalpha(i)) != cBOOL(isALPHA_L1(i))))  {
+                            DEBUG_L(PerlIO_printf(Perl_debug_log,
+                                                "iswalpha(%x) unexpectedly is %x\n",
+                                                i, cBOOL(iswalpha(i))));
+                        }
+                        if (UNLIKELY(cBOOL(iswdigit(i)) != cBOOL(isDIGIT_L1(i))))  {
+                            DEBUG_L(PerlIO_printf(Perl_debug_log,
+                                                "iswdigit(%x) unexpectedly is %x\n",
+                                                i, cBOOL(iswdigit(i))));
+                        }
+                        if (UNLIKELY(cBOOL(iswgraph(i)) != cBOOL(isGRAPH_L1(i))))  {
+                            DEBUG_L(PerlIO_printf(Perl_debug_log,
+                                                "iswgraph(%x) unexpectedly is %x\n",
+                                                i, cBOOL(iswgraph(i))));
+                        }
+                        if (UNLIKELY(cBOOL(iswlower(i)) != cBOOL(isLOWER_L1(i))))  {
+                            DEBUG_L(PerlIO_printf(Perl_debug_log,
+                                                "iswlower(%x) unexpectedly is %x\n",
+                                                i, cBOOL(iswlower(i))));
+                        }
+                        if (UNLIKELY(cBOOL(iswprint(i)) != cBOOL(isPRINT_L1(i))))  {
+                            DEBUG_L(PerlIO_printf(Perl_debug_log,
+                                                "iswprint(%x) unexpectedly is %x\n",
+                                                i, cBOOL(iswprint(i))));
+                        }
+                        if (UNLIKELY(cBOOL(iswspace(i)) != cBOOL(isSPACE_L1(i))))  {
+                            DEBUG_L(PerlIO_printf(Perl_debug_log,
+                                                "iswspace(%x) unexpectedly is %x\n",
+                                                i, cBOOL(iswspace(i))));
+                        }
+                        if (UNLIKELY(cBOOL(iswupper(i)) != cBOOL(isUPPER_L1(i))))  {
+                            DEBUG_L(PerlIO_printf(Perl_debug_log,
+                                                "iswupper(%x) unexpectedly is %x\n",
+                                                i, cBOOL(iswupper(i))));
+                        }
+                    }
+
+                    DEBUG_Lv(PerlIO_printf(Perl_debug_log, "mbtowc returned REPLACEMENT\n"));
                     retval = "UTF-8";
                     break;
                 }
diff --git a/t/loc_tools.pl b/t/loc_tools.pl
index db6a156ee395..2be913ef3163 100644
--- a/t/loc_tools.pl
+++ b/t/loc_tools.pl
@@ -210,7 +210,7 @@ ($$$$)
         if (    CORE::fc($result) ne CORE::fc($locale)
 
                 # C and POSIX are interchangeable
-            && (CORE::fc($result) ne 'posix' || CORE::fc($result) ne 'c'))
+            && ! (CORE::fc($locale) eq 'posix' && CORE::fc($result) eq 'c'))
         {
             _my_diag("setlocale('$locale') returned '$result'\n");
         }