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 726E2385AE75 for ; Wed, 2 Nov 2022 17:17:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 726E2385AE75 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 375724E56; Wed, 2 Nov 2022 18:17:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nabijaczleweli.xyz; s=202205; t=1667409423; bh=AlxCt0v5RRZq5Jx0P2GuGq/McpU2HKwQJwnGje/iyoQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=sWBFayLz7DBScGjRw6a1cj8Fa5oVOdaGeeYezJgW3tBb0GVbN89NESYBqOvrB9slZ WhLRVGxJcm3JXAVBXV+tjSz4lmTH5ph3bhPGKpUoKFt9K1V28IgUTJXDDtw4LpeCDx 6p2UL0c2Cb2p7AbesIuapOBSo/96PGbaljF4Os++o5LYTiu2TIa5905IlZCMf8FdJz WDyfaEfQcqwA6D1SqH4VQvRaC//udtqtwOCATFkUHNqQqbXZd7Av+RM0x6Crz6y5Vp r/naUG9zBFXYhCi4Y6uCXIIlX8lCbRChpWVWjxC8zCK/bD54HRzP36IlVbWy2iyt8B D6dO+NUw013IfQoi0tdfmjbG1nXP6Ec/pdBKX4Cw4CKeJhcmvAr6Eaw95QfHaDJUGG Z4FSmLJTbQy/+jTiDByf1pI3VYNKctR1+2+HgfHbfGPPIbTc1B9E5H0McmnZo/dKdH PdeL4bIt7YbmZ5SYjj/tGfQjRwamCZEJnuknyspMyh1c+xv5y5KHVp45pILtKB/cbC tkUFgpc0G1zGBkqoLGdz4HUiEdqzV48irAeGxydtqnJAKs1R7IuID5bCNMNxS4oJwG pX5zTnBS3+GhuXoiX79Q3q3FxOsVSBxWKsjw7gczxDbozNGvp2RYmSSKJcGsCO/ogx Wqrk3K3qUtmU0oKYdRl0nQiQ= Date: Wed, 2 Nov 2022 18:17:02 +0100 From: =?utf-8?B?0L3QsNCx?= To: libc-alpha@sourceware.org Cc: Florian Weimer Subject: [PATCH v6 1/2] iconvdata/tst-table-charmap.sh: remove handling of old, borrowed format Message-ID: <28e75030de6c069b8f4fa9092c3a54d8e02bda47.1667409408.git.nabijaczleweli@nabijaczleweli.xyz> References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="gnlwr5trdhs6tikl" Content-Disposition: inline In-Reply-To: User-Agent: NeoMutt/20220429 X-Spam-Status: No, score=-8.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FROM_SUSPICIOUS_NTLD,GIT_PATCH_0,KAM_INFOUSMEBIZ,PDS_OTHER_BAD_TLD,PDS_RDNS_DYNAMIC_FP,RDNS_DYNAMIC,SPF_HELO_NONE,SPF_PASS,TXREP 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: --gnlwr5trdhs6tikl 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 new in v6: clean rebase 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 --gnlwr5trdhs6tikl Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEfWlHToQCjFzAxEFjvP0LAY0mWPEFAmNipg0ACgkQvP0LAY0m WPEXkRAAikWoCOXnsb9aMUdhPMCfQh0D6/cuHJaqFeKsEGErGz5PYc5wSANCQLWk OcJo3RtsGjc9NRoIHRFTYsSBZkk/5FWf7ycHlJ3XkJBOoo3HLk2qZ/CBdsOnV2vV X9YV28deHbFiZJobTbnnAJGzSprKnCbefUs4iQTeSgDbYvCPoYdb3TTp005NPt7W 2gr42SYJ9gZs3FlQ7fkbs/NXsuqzXFDNEQRSUbcietErs3zZvW7GnWNUToY2mZa1 f8pBrl0Kh73YOylW7BJj6twXZ+2/fAHlcooB1tfjmVao/blzxu+4wPcxHgHO9Y+E eFARzTEZPy8037fjzUysocRuIXpDw1klTlBK1KLv6kQMV+bZ2JNY+yuIEDeJ6ZgA 1zDg3OtTvN+IYcfg/Lyu1ga6KrqHiRIoLdRw2Cbe2n3cR+ycJ6nv5HevmRhLqU+n a+nO7lljoP14fvOAaMmTVpa3LvRsSWquOD2WWO8xX+lq363puO0h8sOWlHuwjTRz sB4jcDOIYYrTkODjkzrOwcv4cYg5baag/KKn9F0aS/gWaH2yILXPv3DRdj8ftRRB 718Ik3pBxLgQUH8ehtqaZtxhWcfLL6zQMmXy0OVKNwtPr7OwST0EUMsQ4ZHMzD17 2yJ159MGMC5vIw/oxlQ0o1L8c5j4WvK8eKeIt+5ercXt9O76D3c= =WA6A -----END PGP SIGNATURE----- --gnlwr5trdhs6tikl--