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 ABF883858D1E for ; Wed, 14 Sep 2022 02:39:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org ABF883858D1E 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 065D21154; Wed, 14 Sep 2022 04:39:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nabijaczleweli.xyz; s=202205; t=1663123142; bh=iDTrmf6lYHzWHkMTocwoR/ZDJPd/NJZSH30ygSNJJMs=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=I56s/9h+qqak5uSxVRs7Tg9BKBXqDXDAG2+NxMw7yrr0jSt6W19BQ/me/Per/rDvH cMlrhZalHZay0NlL9Y9WSlTPkuwopia5v/Jf+oI4ku8xfcLhUCR1iuJEwWi2KZ3s80 HtOIS/9HX4hCZ5vOIJG8umuf4QL+UqBcRv9BBAeeoLtody8D6he0vwV8/LcStMctpw UJC9lnvGd0s5wjDPuR90UdDFmy5/sY8t9Rac5hUHLb/B+LSypB+VwGTVDg9a5C23Qg xrWSaSqCyOgPtrPsFgMDh7f5PFEZhxs5wpE88FCiZbINQli+g//cdxhJy5l8MKOyli RSEzeVk6KYMSkOvxY4Zv17edMsquCDrrLVXjbZUmnnqFe9E4NAoLHvBJzXU6L4Fdlr cUUn5f0dM9VmTWuKpiybbrU4tTsOsF0A36eFuCxHdudisMppa7LNhHhAczgZbvllW5 LjHvWO9XSbL/lHBACusJeFIcizwTugs5Wc8V4yrqttEZneMo9oR09MW73Pe5mX1/mA CVEAleeW0f05uP2Z2RRPg+Q33OQ6oW9jDcpt+Bvd8CaiMq3wp8MvJ6JWNZUrWw7eYe lTHfxg4bz0VZQ6J25JwvZmf7867/rXwu7w6rC3CbUSqkS2zWVffsnE+ov5qGL8ylxM FpYEtEY2cl6Mfgham1FAN5UE= Date: Wed, 14 Sep 2022 04:39:00 +0200 From: =?utf-8?B?0L3QsNCx?= To: libc-alpha@sourceware.org Cc: Florian Weimer Subject: [PATCH v4 1/2] iconvdata/tst-table-charmap.sh: remove handling of old, borrowed format Message-ID: <33460cc477c856fd185bb8355088bfaa8f208ebb.1663123101.git.nabijaczleweli@nabijaczleweli.xyz> References: <4f9ff9b04235a8654b866a97dc9adc819ed7e393.1662487816.git.nabijaczleweli@nabijaczleweli.xyz> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="dhcnnay7coajsnpu" Content-Disposition: inline In-Reply-To: <4f9ff9b04235a8654b866a97dc9adc819ed7e393.1662487816.git.nabijaczleweli@nabijaczleweli.xyz> User-Agent: NeoMutt/20220429 X-Spam-Status: No, score=-7.6 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,RDNS_DYNAMIC,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE 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: --dhcnnay7coajsnpu 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 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 --dhcnnay7coajsnpu Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEfWlHToQCjFzAxEFjvP0LAY0mWPEFAmMhPsQACgkQvP0LAY0m WPHTqRAAuQjQyRUgME//t/DMkCLhA0okmiTawZqO9AKkTjnCaYH8yS3X6GJi9PS4 v8DHnWJDQ+c5ZY3I+U3ax0RRKkd9Lp4INNKpNDYnUu/6YSPm74viuWGw4Kk/+Ir/ Mt4JbCPiDLUz/Pb6wRnX5YMc1dJXskj2JnlG8iiHhStA/xYIgtwjtxKKRY+NF/G8 899zK20K1AbhteaomctzRufRXhGUgSt1aaMIDnWWebyMd/OrraPNy1EfRMBLjHw/ ofmYWm2WLynI7IghZGRzutnKZPt0mHyj4ABUVJIFT1X3hEBU57R0MRA9dRwa7Bfe nEY+95tM8Bw3zick0sMXUnmu8DWJ8sHCCXa6GkHfeTopWKtvDLkWIx55WU3wjcZu ab1DIA+1U/q/OYn71v+ybMpNknqP5llwNIbw0i6ef7D0jI7cd/v7UhfFtOmHufuT donFgIRv9L9D/q4wIdhYNxmuVZXFHx3fL6EuonmZsqvG1DMnYZ/YDhaQaTLM0kQ1 lLFX9giWl8mKMWebw946k9/6gkDiCq3GqgoMD4DbjO0bVZoamtw4MT2pCx/yaTgh LfCT6eNypPph6XlFmt+n+QsHbDdv9adS2v1UkbRYnWllOehynw5HATL7U5yhhW6a z4d9mIDxfnsID+vzVvnjyk8iwEilO3ps0Okw+m+udQD0Z0Pmkxg= =+mxt -----END PGP SIGNATURE----- --dhcnnay7coajsnpu--