From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from tarta.nabijaczleweli.xyz (unknown [139.28.40.42]) by sourceware.org (Postfix) with ESMTP id 983CB385840F for ; Wed, 21 Sep 2022 14:01:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 983CB385840F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=nabijaczleweli.xyz Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=nabijaczleweli.xyz Received: from tarta.nabijaczleweli.xyz (unknown [192.168.1.250]) by tarta.nabijaczleweli.xyz (Postfix) with ESMTPSA id 53BDF16F8; Wed, 21 Sep 2022 16:01:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nabijaczleweli.xyz; s=202205; t=1663768905; bh=ghyvazmIlFYeZT+m0XQ4XREGYSWfSNX8pQQ6VDbSMqw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=RAeUTcrLtNC83DUfKYawwv58fr5FJ5/VNz9+fei0hmlr0mrFi4AFUBRhQppoBdgoe 67i/W9J1vECDu1RI1Gg+UwgpZessYiwtYYPxOYSxZC3x2QSrUyMMyfRZl5Us1jSAZs rE5DRMA9xeAbKPn2LpwdGIcqzZPuZb6gLVZDLLd3izI0zfzDNp+e+h00Eoh8VA7F6W 6icnFF+4imp5UQLjizFLgv2C3Nh+Bb1ECris2ECnKmGbDcSoNoXfjhfZUpt+j7uz03 O5b+0rWw5lYEhWeNmjE4aoIzjV9S2e6UOQ1jMzgnDhVaMB1zIu/6IRscTz23mJg7MB /T6RXCOiiyUvbqAwmW7BqaHvxOdNzfqwkYpgR29Ic8LgBlewb1bTJHUtZ2g0Xioyj0 Wk3RgSExV0t3E7vraLlTx1DLlhBC6zXAbeHKe8xEzSyMfDjqtQJyBUQq0nn2VZJJCL punP6SFBk9GplnNytvnyF/OaKUQINz1CctfW1zuSH9UtfFJ0O02mpjX645psboJGgj J9n5r0Dhy56X6rb4Xz/ZuxpP5kHCFyBwyUOOBWGCEmgLZw2r9XQNEIRT3W/wBSbSrx JEBLkoKKmekWYXQ5Jp4aKkCrQ2Rkgg0abjtdK6iUnl2P/XWRQZ1HXh5tVoBoVPdgBK ldrQx7SKlUN57lod97IQyrEo= Date: Wed, 21 Sep 2022 16:01:44 +0200 From: =?utf-8?B?0L3QsNCx?= To: libc-alpha@sourceware.org Cc: Florian Weimer Subject: [PATCH v5 1/2] iconvdata/tst-table-charmap.sh: remove handling of old, borrowed format Message-ID: References: <33460cc477c856fd185bb8355088bfaa8f208ebb.1663123101.git.nabijaczleweli@nabijaczleweli.xyz> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="oij4co3lmtdzq3ml" Content-Disposition: inline In-Reply-To: <33460cc477c856fd185bb8355088bfaa8f208ebb.1663123101.git.nabijaczleweli@nabijaczleweli.xyz> User-Agent: NeoMutt/20220429 X-Spam-Status: No, score=-8.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FROM_SUSPICIOUS_NTLD,GIT_PATCH_0,KAM_INFOUSMEBIZ,RDNS_DYNAMIC,SPF_HELO_NONE,SPF_PASS,TXREP,T_PDS_OTHER_BAD_TLD autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --oij4co3lmtdzq3ml Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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] =3D=3D POSIX Upcoming is a POSIX charmap, which would inadvertently trigger this: clear the way Signed-off-by: Ahelenia Ziemia=C5=84ska --- new in v4: nothing new in v5: nothing Resending after a week, per guideline. 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: =20 - ./tst-table-charmap.sh GB18030 < ../localedata/charmaps/GB18030 \ + ./tst-table-charmap.sh < ../localedata/charmaps/GB18030 \ > GB18030.table */ =20 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=3DC export LC_ALL =20 -case "$1" in - POSIX ) - # Old POSIX/DKUUG borrowed format - grep '^<.*>.*/x[0-9A-Fa-f]*[ ]*.*$' | grep -v 'not a real char= acter' | 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 abcde= f 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-9= A-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 AB= CDEF | sed -e 's,/x\([0-9A-F][0-9A-F]\),\1,g' | sed -e 's,^,0x,' | sort | u= niq | 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 =20 # 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 encodi= ng, --=20 2.30.2 --oij4co3lmtdzq3ml Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEfWlHToQCjFzAxEFjvP0LAY0mWPEFAmMrGUcACgkQvP0LAY0m WPHMbg//Wruf2z6nfISnDGVMVIHdWqd5ihGa4J6YBPLCVZKtEAwMtwKpAm44yV0+ VSK29+SzOvG3MV4NrDtwuENFVLv2gpKL5zGpNxKBzEQzn7xFu5zdCR1nJyUck+7z 9frZsbeq+RhqfrLrjBmqj8ddYgvdh3YPtiShYNkkhr5HmMQem3uBwANKYz3RsCpE nbpmUw51KXEZHdDlX8oS3kTvVP9w6xRyqwpN/9wdROxnU9AjVCcRmd8HdmaCLlh3 lc2qeMiSFuikkw9Isb37Lh2OhBbMFc77EnR+pBs/Kc/oLbAQ3ukxS3koe382niag ZfoHeVBr3ch7cYUXV9qlpjJ/jMeQyuIV6UoXIJLy8fJnWjBoJFY64MyZm9qDqCV4 lS/kPyVDUc4QTijYkTlceUt+bQRJqBeSv4iN6CIjZS2JWL0G/hE4DxWQTkeEdHhn pXOjgVimQZovghhbIMuCQFtbY4BGd5SC9ghnoTOj2PsZTDrUQU5CuXkzfG6Ijv2y 4ob92nZqKRBvZLZvbh5pSJg2/LDFAa7jy8SAajOfaQkDxMVU3cSV6SvJONyhj/21 EY9yYCIC+2GbToCSdRZ6C4jBc+6tKbhm4R4ap4pVS7vIvvja0ZMiqoI/Yx8Fdlr3 oO/qJAlMdxwX4KSxL3R6pucbHG40l1MaZh9p6iHTx3LQyplaHNA= =NIwB -----END PGP SIGNATURE----- --oij4co3lmtdzq3ml--