[newlib-cygwin/main] Cygwin: fetch-lc-def-codesets-from-linux: fix locale name handling

[newlib-cygwin/main] Cygwin: fetch-lc-def-codesets-from-linux: fix locale name handling

[Corinna Vinschen]

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=5011c8cc48a22d9ccfc8d11a0f5cbfc0e5db73a6

commit 5011c8cc48a22d9ccfc8d11a0f5cbfc0e5db73a6
Author:     Corinna Vinschen <corinna@vinschen.de>
AuthorDate: Sun Feb 26 20:14:54 2023 +0100
Commit:     Corinna Vinschen <corinna@vinschen.de>
CommitDate: Sun Feb 26 20:14:54 2023 +0100

    Cygwin: fetch-lc-def-codesets-from-linux: fix locale name handling
    
    As the former call to `locale -av' has the unwanted side effect
    to shorten the locale name to <= 15 chars, don't use it.  Use
    `locale -a' instead and fetch the codeset from another call to
    `locale' for each locale.
    
    Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

Diff:
---
 .../fetch-lc-def-codesets-from-linux               | 23 +++++++++++-----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/winsup/cygwin/linux-locale-helpers/fetch-lc-def-codesets-from-linux b/winsup/cygwin/linux-locale-helpers/fetch-lc-def-codesets-from-linux
index 2a6f6cca2a90..9bb0533418ed 100755
--- a/winsup/cygwin/linux-locale-helpers/fetch-lc-def-codesets-from-linux
+++ b/winsup/cygwin/linux-locale-helpers/fetch-lc-def-codesets-from-linux
@@ -10,17 +10,16 @@
 	} default_codeset[] =
 	{
 	EOF
-  locale -av | \
-  awk '/^locale:/{
-		   if ( index ($2, "_") == 0 ) next # No aliases
-		   if ( index ($2, ".") > 0 ) next # No explicit codesets
-		   locale = gensub (/devanagar.*/, "devanagari", 1, $2);
-		 }
-       /codeset/ {
-		   if ( length (locale) == 0 ) next
-		   codeset = gensub (/BIG5.*/, "BIG5", 1, $3);
-		   printf "  { \"%s\", \"%s\" },\n", locale, codeset;
-		   locale = "";
-		 }'
+  locale -a | \
+  awk '{
+	 if ( index ($1, "_") == 0 ) next # No aliases
+	 if ( index ($1, ".") > 0 ) next # No explicit codesets
+	 locale = $1
+	 cmd = "LC_CTYPE=" locale " locale -ck LC_CTYPE | grep charmap"
+	 cmd | getline codeset
+	 codeset = gensub (/charmap="(.*)"/, "\\1", 1, codeset)
+	 codeset = gensub (/BIG5.*/, "BIG5", 1, codeset);
+	 printf "  { \"%s\", \"%s\" },\n", locale, codeset;
+       }'
   echo "};"
 ) > lc_def_codesets.h