From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id 6FE973858031; Wed, 9 Nov 2022 12:49:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6FE973858031 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1667998147; bh=Np7Ee3I4oEW5Vd2F5673bfzibzaPQ6k3fIcyFANF0mg=; h=From:To:Subject:Date:From; b=W3uhhDzpWmZJ04bgGUhPOoZV0xbxx9SCc03bF+/ATEjoGnUUMZ3hCq8+R5P5ve3LH yiV8DzhhCpeZYmlbQglFwNFqIA0ncCxP6voyKfzsOVSMldp/plc4L1AsOqIbG0AXjb ZYkJ1olRdLj3IEdZ7TNhrnDlK6MjL1z2crFJ7E4k= MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc] iconvdata/tst-table-charmap.sh: remove handling of old, borrowed format X-Act-Checkin: glibc X-Git-Author: =?utf-8?b?0L3QsNCx?= X-Git-Refname: refs/heads/master X-Git-Oldrev: 2ae7990542e1955097aa21943e416dec70f867fa X-Git-Newrev: 049781285dad97e33c6d54e5c6e3c8c6f6eda69e Message-Id: <20221109124907.6FE973858031@sourceware.org> Date: Wed, 9 Nov 2022 12:49:07 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=049781285dad97e33c6d54e5c6e3c8c6f6eda69e commit 049781285dad97e33c6d54e5c6e3c8c6f6eda69e Author: наб Date: Wed Nov 9 13:48:46 2022 +0100 iconvdata/tst-table-charmap.sh: remove handling of old, borrowed format 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. Signed-off-by: Ahelenia Ziemiańska Reviewed-by: Florian Weimer Diff: --- 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]*[ ]*.*$' | grep -v 'not a real character' | sed -e 's,^<.*>[ ]*\([/x0-9A-Fa-f]*\)[ ]*.*$,\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 '^[ ]*/x' | grep -v 'not a real character' | sed -e 's,[ ]*\([/x0-9A-Fa-f]*\).*$,\2 0x\1,' -e 's,[ ]*\([/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 '^[ ]*/x' | grep -v 'not a real character' | sed -e 's,[ ]*\([/x0-9A-Fa-f]*\).*$,\2 0x\1,' -e 's,[ ]*\([/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,