From patchwork Sun Mar 20 16:41:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Gautier X-Patchwork-Id: 52151 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 377A83857831 for ; Sun, 20 Mar 2022 16:41:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 377A83857831 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1647794494; bh=JFCwdpDNLB8+wcf5Awl3yxWV1TKr++oAytIn5quG2JU=; 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=U5KLBugZPeNOxL8wL/1uGHzdptuEm1PjRCxwfrL1IDGS4nWB+sPrGl/cjskI5gf/a k9vWhwfj7y2DaRfh2HThjkulNuZBtLeSWIgQFYdSnSqGB7KW7cMHx8sHN0vhZOWxlJ DYzY+XmCxtD7jma/f+vfz8rrLjWY8GYd1Pm2vpPk= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [80.241.56.172]) by sourceware.org (Postfix) with ESMTPS id 7E8123858C74 for ; Sun, 20 Mar 2022 16:41:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7E8123858C74 Received: from smtp102.mailbox.org (smtp102.mailbox.org [80.241.60.233]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4KM3RB3hZVz9sSQ; Sun, 20 Mar 2022 17:41:10 +0100 (CET) Date: Sun, 20 Mar 2022 17:41:05 +0100 To: libc-alpha@sourceware.org Subject: [PATCH v5 2/4] iconv: Better mapping to RFC for UTF-7 Message-ID: Mail-Followup-To: Max Gautier , libc-alpha@sourceware.org References: <87blcw9ptq.fsf@oldenburg.str.redhat.com> <20211209093152.313872-1-mg@max.gautier.name> <20211209093152.313872-3-mg@max.gautier.name> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20211209093152.313872-3-mg@max.gautier.name> X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org 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: , X-Patchwork-Original-From: Max Gautier via Libc-alpha From: Max Gautier Reply-To: Max Gautier Cc: mg@max.gautier.name Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" - Direct use of characters instead of arcane arrays - isxbase64 is not the Modified BASE64 alphabet, but the characters who needs to trigger an explicit shift back to US-ASCII. Make that clearer Signed-off-by: Max Gautier Reviewed-by: Adhemerval Zanellla --- iconvdata/utf-7.c | 64 ++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/iconvdata/utf-7.c b/iconvdata/utf-7.c index 9ba0974959..15f3669ac8 100644 --- a/iconvdata/utf-7.c +++ b/iconvdata/utf-7.c @@ -30,20 +30,27 @@ +static bool +between (uint32_t const ch, + uint32_t const lower_bound, uint32_t const upper_bound) +{ + return (ch >= lower_bound && ch <= upper_bound); +} + /* The set of "direct characters": A-Z a-z 0-9 ' ( ) , - . / : ? space tab lf cr */ -static const unsigned char direct_tab[128 / 8] = - { - 0x00, 0x26, 0x00, 0x00, 0x81, 0xf3, 0xff, 0x87, - 0xfe, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0x07 - }; - -static int -isdirect (uint32_t ch) +static bool +isdirect (uint32_t ch, enum variant var) { - return (ch < 128 && ((direct_tab[ch >> 3] >> (ch & 7)) & 1)); + return (between (ch, 'A', 'Z') + || between (ch, 'a', 'z') + || between (ch, '0', '9') + || ch == '\'' || ch == '(' || ch == ')' + || between (ch, ',', '/') + || ch == ':' || ch == '?' + || ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r'); } @@ -52,33 +59,27 @@ isdirect (uint32_t ch) ! " # $ % & * ; < = > @ [ ] ^ _ ` { | } */ -static const unsigned char xdirect_tab[128 / 8] = - { - 0x00, 0x26, 0x00, 0x00, 0xff, 0xf7, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xef, 0xff, 0xff, 0xff, 0x3f - }; - -static int -isxdirect (uint32_t ch) +static bool +isxdirect (uint32_t ch, enum variant var) { - return (ch < 128 && ((xdirect_tab[ch >> 3] >> (ch & 7)) & 1)); + return (ch == '\t' + || ch == '\n' + || ch == '\r' + || (between (ch, ' ', '}') && ch != '+' && ch != '\\')); } -/* The set of "extended base64 characters": +/* Characters which needs to trigger an explicit shift back to US-ASCII (UTF-7 + only): Modified base64 + '-' (shift back character) A-Z a-z 0-9 + / - */ -static const unsigned char xbase64_tab[128 / 8] = - { - 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0xff, 0x03, - 0xfe, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0x07 - }; - -static int -isxbase64 (uint32_t ch) +static bool +needs_explicit_shift (uint32_t ch) { - return (ch < 128 && ((xbase64_tab[ch >> 3] >> (ch & 7)) & 1)); + return (between (ch, 'A', 'Z') + || between (ch, 'a', 'z') + || between (ch, '/', '9') || ch == '+' || ch == '-'); } @@ -252,7 +253,7 @@ base64 (unsigned int i) indeed form a Low Surrogate. */ \ uint32_t wc2 = wch & 0xffff; \ \ - if (! __builtin_expect (wc2 >= 0xdc00 && wc2 < 0xe000, 1)) \ + if (! __glibc_likely (wc2 >= 0xdc00 && wc2 < 0xe000)) \ { \ STANDARD_FROM_LOOP_ERR_HANDLER ((statep->__count = 0, 1));\ } \ @@ -372,7 +373,8 @@ base64 (unsigned int i) /* deactivate base64 encoding */ \ size_t count; \ \ - count = ((statep->__count & 0x18) >= 0x10) + isxbase64 (ch) + 1; \ + count = ((statep->__count & 0x18) >= 0x10) \ + + needs_explicit_shift (ch) + 1; \ if (__glibc_unlikely (outptr + count > outend)) \ { \ result = __GCONV_FULL_OUTPUT; \ @@ -381,7 +383,7 @@ base64 (unsigned int i) \ if ((statep->__count & 0x18) >= 0x10) \ *outptr++ = base64 ((statep->__count >> 3) & ~3); \ - if (isxbase64 (ch)) \ + if (needs_explicit_shift (ch)) \ *outptr++ = '-'; \ *outptr++ = (unsigned char) ch; \ statep->__count = 0; \