From: наб <nabijaczleweli@nabijaczleweli.xyz>
To: libc-alpha@sourceware.org
Cc: Florian Weimer <fweimer@redhat.com>
Subject: [PATCH v5 1/2] iconvdata/tst-table-charmap.sh: remove handling of old, borrowed format
Date: Wed, 21 Sep 2022 16:01:44 +0200 [thread overview]
Message-ID: <ad6720f44981d53ce50804d4ea3696ca1b7cd0b7.1663768863.git.nabijaczleweli@nabijaczleweli.xyz> (raw)
In-Reply-To: <33460cc477c856fd185bb8355088bfaa8f208ebb.1663123101.git.nabijaczleweli@nabijaczleweli.xyz>
[-- Attachment #1: Type: text/plain, Size: 3201 bytes --]
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] == POSIX
Upcoming is a POSIX charmap, which would inadvertently trigger this:
clear the way
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
---
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:
- ./tst-table-charmap.sh GB18030 < ../localedata/charmaps/GB18030 \
+ ./tst-table-charmap.sh < ../localedata/charmaps/GB18030 \
> GB18030.table
*/
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=C
export LC_ALL
-case "$1" in
- POSIX )
- # Old POSIX/DKUUG borrowed format
- grep '^<.*>.*/x[0-9A-Fa-f]*[ ]*<U....>.*$' | grep -v 'not a real character' | sed -e 's,^<.*>[ ]*\([/x0-9A-Fa-f]*\)[ ]*<U\(....\)>.*$,\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 '^<U[0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F]*>[ ]*/x' | grep -v 'not a real character' | sed -e 's,<U\(....\)>[ ]*\([/x0-9A-Fa-f]*\).*$,\2 0x\1,' -e 's,<U0*\([1-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F]*\)>[ ]*\([/x0-9A-Fa-f]*\).*$,\2 0x\1,' | 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]\)'
- ;;
-esac
+sed -e 's,^%IRREVERSIBLE%,,' | grep '^<U[0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F]*>[ ]*/x' | grep -v 'not a real character' | sed -e 's,<U\(....\)>[ ]*\([/x0-9A-Fa-f]*\).*$,\2 0x\1,' -e 's,<U0*\([1-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F]*\)>[ ]*\([/x0-9A-Fa-f]*\).*$,\2 0x\1,' | 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]\)'
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
# 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 encoding,
--
2.30.2
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2022-09-21 14:01 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-30 18:19 [PATCH] POSIX locale covers every byte [BZ# 29511] наб
2022-09-06 14:06 ` [PATCH v2] " наб
2022-09-06 14:19 ` [PATCH] " Florian Weimer
2022-09-06 18:06 ` наб
2022-09-06 18:10 ` [PATCH v3 1/2] iconvdata/tst-table-charmap.sh: remove handling of old, borrowed format наб
2022-09-14 2:39 ` [PATCH v4 " наб
2022-09-21 14:01 ` наб [this message]
2022-11-02 17:17 ` [PATCH v6 " наб
2022-11-09 12:49 ` Florian Weimer
2022-11-02 17:17 ` [PATCH v6 2/2] POSIX locale covers every byte [BZ# 29511] наб
2022-11-09 14:20 ` Florian Weimer
2022-11-09 16:14 ` [PATCH v7] " наб
2022-11-10 9:52 ` Florian Weimer
2023-01-09 15:17 ` [PATCH v8] " наб
2023-02-07 14:16 ` [PATCH v9] " наб
2023-02-13 14:52 ` Florian Weimer
2023-04-26 18:54 ` наб
2023-04-26 21:27 ` Florian Weimer
2023-04-27 0:17 ` [PATCH v10] " наб
2023-04-28 15:43 ` [PATCH v11] " наб
2023-05-07 22:53 ` [PATCH v12] " наб
2023-05-29 13:54 ` [PATCH v13] " наб
2022-11-10 8:10 ` [PATCH v6 2/2] " Florian Weimer
2022-11-28 16:24 ` наб
2022-12-02 17:36 ` Florian Weimer
2022-12-02 18:42 ` наб
2022-09-21 14:01 ` [PATCH v5 " наб
2022-09-14 2:39 ` [PATCH v4 " наб
2022-09-06 18:11 ` [PATCH v3 " наб
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ad6720f44981d53ce50804d4ea3696ca1b7cd0b7.1663768863.git.nabijaczleweli@nabijaczleweli.xyz \
--to=nabijaczleweli@nabijaczleweli.xyz \
--cc=fweimer@redhat.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).