From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS17314 8.43.84.0/22 X-Spam-Status: No, score=-2.6 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, PDS_OTHER_BAD_TLD,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=no autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 17C081F910 for ; Wed, 2 Nov 2022 17:17:34 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="i82w/dGa"; dkim-atps=neutral Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3585A3857030 for ; Wed, 2 Nov 2022 17:17:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3585A3857030 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1667409452; bh=Xno3yWuOWK9/ojREtlOGMqfLfZhdJkmWcnVLdy92LOA=; h=Date:To:Subject:References:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=i82w/dGabOKXqYxMnN3KolcBfr3PCopKU+YLAxZv7RKujjYVBZkmSLTnn+l/dqkRg uZMljZtyhFACX9qjOacW26Zw41YMRSktmSnpC5sGcXFLAmoZt3gzI/g6y9lzVBjG+J fFfcPbK7pySiNeyij5ecmEK6xIe4VV28DkPjSt8A= 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 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) Date: Wed, 2 Nov 2022 18:17:02 +0100 To: libc-alpha@sourceware.org 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-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: =?utf-8?b?0L3QsNCxIHZpYSBMaWJjLWFscGhh?= Reply-To: =?utf-8?B?0L3QsNCx?= Cc: Florian Weimer Errors-To: libc-alpha-bounces+e=80x24.org@sourceware.org Sender: "Libc-alpha" --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--