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.2 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,RDNS_DYNAMIC,SPF_HELO_PASS, SPF_PASS,T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=no autolearn_force=no version=3.4.2 Received: from sourceware.org (ip-8-43-85-97.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 2A1DC1F54E for ; Tue, 6 Sep 2022 18:10:50 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="rucSEn6w"; dkim-atps=neutral Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3D0A9385142A for ; Tue, 6 Sep 2022 18:10:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3D0A9385142A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1662487849; bh=BMossguwNLXbKjvOwgHpd4KbuV7BzAGg/gU7mP30aoU=; 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=rucSEn6wRHjXprLQUvX+h4LnHLYCjTMnydqnSNdd4q7VdUtBQX10hyIBVITC7Pv9+ /EH1Wh0eaeEO2TwfwS3kLIuqOe9Hut+RIbEEJvsOYXtMz7jP1HBllG+82Zjfbczp/+ 8Da215j/smJLt+0ygTLDvmCnI2lk9pTb/Hl0GLJs= Received: from tarta.nabijaczleweli.xyz (unknown [139.28.40.42]) by sourceware.org (Postfix) with ESMTP id AE6273853553 for ; Tue, 6 Sep 2022 18:10:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AE6273853553 Received: from tarta.nabijaczleweli.xyz (unknown [192.168.1.250]) by tarta.nabijaczleweli.xyz (Postfix) with ESMTPSA id 9119A9C8; Tue, 6 Sep 2022 20:10:29 +0200 (CEST) Date: Tue, 6 Sep 2022 20:10:28 +0200 To: libc-alpha@sourceware.org Subject: [PATCH v3 1/2] iconvdata/tst-table-charmap.sh: remove handling of old, borrowed format Message-ID: <4f9ff9b04235a8654b866a97dc9adc819ed7e393.1662487816.git.nabijaczleweli@nabijaczleweli.xyz> References: <20220906180657.eo53xia2yqqiv4ri@tarta.nabijaczleweli.xyz> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="nn2nt4j3e35ljldr" Content-Disposition: inline In-Reply-To: <20220906180657.eo53xia2yqqiv4ri@tarta.nabijaczleweli.xyz> 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" --nn2nt4j3e35ljldr 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 --- 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 --nn2nt4j3e35ljldr Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEfWlHToQCjFzAxEFjvP0LAY0mWPEFAmMXjRQACgkQvP0LAY0m WPEZ0g/9HkuStg+hI7nrfIHv0I8tBzoeM/IFPeewNLE73E/MvZCkxdsu+7ROSrt2 EeFfhOFlYQoB+/peN4SU+L9Pf2UtW/U0qlkPjtJ1N89euENgnAojoj6wCAfK6QTY dRlWRDF994r/05x5K3WjGBO22pkVksYKgionAnGm61jMfwfXF3RQBe4Nta7xuwaF cRT20jjwHKg2kF/V052M9PFP0kyyVr7TM5rFfmwrO/YdITsc2qROaNX4rWuGXqQ1 JhVTaMyRM+k/7ttzA5fJ409oJjCFNyJ/Vgy0a/cf0ECgxTeqh1P4+sPuu6RP4niS i27Vu4Ms9bHPRScgxNbzU993fgOLX9OCOw373Zl/1j8D04qjtDJWWYQlxp0Lsncd aoOgFqEjiX5P7uq2EEZ2lr0/njWh4CX3aL14g9mbEZ4rhQjxI1ySH7p4BHFKrX8G M1uMx8IrEeEzP3ZUEaX3QesIMr004GGWZxoaeKvRZ6FxoOeOqy70vCoHg1ILda2r GpYnP4ANWzuaicn/C7MxGgxsssxKGJ2WAjfU1Ai59lQx9u8kJTPt0d4KOaRwacdz ssv2s3TzD1om1s05soXJNKHAbs0NHbGWd5F0aWmyKeW0rkteqbGlydhyc/NOsE+P mOvkiYQMIIOGYItUjVNG6Zjuic846WtcQ8KXeyRUClAUGwuTy6U= =Q4Bz -----END PGP SIGNATURE----- --nn2nt4j3e35ljldr--