[PATCH v3 1/2] iconvdata/tst-table-charmap.sh: remove handling of old, borrowed format

[наб <nabijaczleweli@nabijaczleweli.xyz>]

[-- Attachment #1: Type: text/plain, Size: 3117 bytes --]

This "Old POSIX/DKUUG borrowed format" handling is original to the file
and doesn't seem to have ever been used, i.e. id/t-t-c doesn't seem to
have ever been called with argv[1] == POSIX

Upcoming is a POSIX charmap, which would inadvertently trigger this:
clear the way

Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
---
 iconvdata/gb18030.c            |  2 +-
 iconvdata/tst-table-charmap.sh | 11 +----------
 iconvdata/tst-table.sh         |  2 +-
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/iconvdata/gb18030.c b/iconvdata/gb18030.c
index ab9373cd12..bb93b55361 100644
--- a/iconvdata/gb18030.c
+++ b/iconvdata/gb18030.c
@@ -32,7 +32,7 @@
 /* The tables in this file are generated from the charmap.
    In a first step, the charmap is converted to a simple table format:
 
-      ./tst-table-charmap.sh GB18030 < ../localedata/charmaps/GB18030 \
+      ./tst-table-charmap.sh < ../localedata/charmaps/GB18030 \
       > GB18030.table
 */
 
diff --git a/iconvdata/tst-table-charmap.sh b/iconvdata/tst-table-charmap.sh
index 0e5369aa38..36959a02dd 100755
--- a/iconvdata/tst-table-charmap.sh
+++ b/iconvdata/tst-table-charmap.sh
@@ -22,13 +22,4 @@
 LC_ALL=C
 export LC_ALL
 
-case "$1" in
-  POSIX )
-    # Old POSIX/DKUUG borrowed format
-    grep '^<.*>.*/x[0-9A-Fa-f]*[ 	]*<U....>.*$' | grep -v 'not a real character' | sed -e 's,^<.*>[ 	]*\([/x0-9A-Fa-f]*\)[ 	]*<U\(....\)>.*$,\1	0x\2,' | tr abcdef ABCDEF | sed -e 's,/x\([0-9A-F][0-9A-F]\),\1,g' | sed -e 's,^,0x,' | sort | uniq | grep -v '^0x00	0x\([1-9A-F]...\|.[1-9A-F]..\|..[1-9A-F].\|...[1-9A-F]\)'
-    ;;
-  *)
-    # New Unicode based format
-    sed -e 's,^%IRREVERSIBLE%,,' | grep '^<U[0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F]*>[ 	]*/x' | grep -v 'not a real character' | sed -e 's,<U\(....\)>[ 	]*\([/x0-9A-Fa-f]*\).*$,\2	0x\1,' -e 's,<U0*\([1-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F]*\)>[ 	]*\([/x0-9A-Fa-f]*\).*$,\2	0x\1,' | tr abcdef ABCDEF | sed -e 's,/x\([0-9A-F][0-9A-F]\),\1,g' | sed -e 's,^,0x,' | sort | uniq | grep -v '^0x00	0x\([1-9A-F]...\|.[1-9A-F]..\|..[1-9A-F].\|...[1-9A-F]\)'
-    ;;
-esac
+sed -e 's,^%IRREVERSIBLE%,,' | grep '^<U[0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F]*>[ 	]*/x' | grep -v 'not a real character' | sed -e 's,<U\(....\)>[ 	]*\([/x0-9A-Fa-f]*\).*$,\2	0x\1,' -e 's,<U0*\([1-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F]*\)>[ 	]*\([/x0-9A-Fa-f]*\).*$,\2	0x\1,' | tr abcdef ABCDEF | sed -e 's,/x\([0-9A-F][0-9A-F]\),\1,g' | sed -e 's,^,0x,' | sort | uniq | grep -v '^0x00	0x\([1-9A-F]...\|.[1-9A-F]..\|..[1-9A-F].\|...[1-9A-F]\)'
diff --git a/iconvdata/tst-table.sh b/iconvdata/tst-table.sh
index f63ab1d8ee..36005c5448 100755
--- a/iconvdata/tst-table.sh
+++ b/iconvdata/tst-table.sh
@@ -33,7 +33,7 @@ export LC_ALL
 set -e
 
 # Get the charmap.
-./tst-table-charmap.sh ${charmap:-$charset} \
+./tst-table-charmap.sh \
   < ../localedata/charmaps/${charmap:-$charset} \
   > ${objpfx}tst-${charset}.charmap.table
 # When the charset is GB18030, truncate this table because for this encoding,
-- 
2.30.2


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]