From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ot1-x32f.google.com (mail-ot1-x32f.google.com [IPv6:2607:f8b0:4864:20::32f]) by sourceware.org (Postfix) with ESMTPS id 5731D3858D35 for ; Mon, 7 Mar 2022 12:10:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5731D3858D35 Received: by mail-ot1-x32f.google.com with SMTP id j3-20020a9d7683000000b005aeed94f4e9so12767479otl.6 for ; Mon, 07 Mar 2022 04:10:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=Zm6zi1rebBAziaL87FcyScj9BHZ9XBkFBrOpNLSKvyk=; b=jlTbFOLKmyIzbTJ8H97Vx0Se6HfM++SEgnumvnz5O5qmFuX2uqlY2UuNlw1OQRCK3i 0WZwc4/I800sb1kWmSj3Z53ZDevNLg7eqWdsQJrloZAHrooXukevRiq+0v40PkRDMius O+ODU9BFtZOJbYgdZOYXHwr7L37KQuE0T6DZkwdJzBwQ/fJy50KwT4CJDCOFHwBbNu+B Kx5ThRAxM+oWU0IWkXkxpKI5ep+nXVVusNcGkZn+mvCEL04zJsOhH7haPpYMYzcavk0D UnUi/Aid1hepUnv8jxbK/CuBPI2uRumfPZyKYp4vqA4ShIP3v4zGLjMi+P1l/ZXQI+Lw 2hbA== X-Gm-Message-State: AOAM530N/RIeaD6Iz5zY+A/tWRZxNY6R9QNMfK1Y7+wQFb2TPmDQS4/5 Udx+RT08dkjygnpONlNQsfS+s0X1cjjH0Q== X-Google-Smtp-Source: ABdhPJxRDBXXjJcQ53/1H2Fi3sVb1VvA46R1Vi7JQZbRBslOIy7j8qu5A4KC7fOGVZaEqmvm5+oonw== X-Received: by 2002:a05:6830:14c4:b0:5af:b057:65f5 with SMTP id t4-20020a05683014c400b005afb05765f5mr5383205otq.272.1646655019749; Mon, 07 Mar 2022 04:10:19 -0800 (PST) Received: from ?IPV6:2804:431:c7ca:2dcb:c0d9:9b45:50c5:bc8e? ([2804:431:c7ca:2dcb:c0d9:9b45:50c5:bc8e]) by smtp.gmail.com with ESMTPSA id bp8-20020a056808238800b002c6b56d99bcsm6526240oib.13.2022.03.07.04.10.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 07 Mar 2022 04:10:19 -0800 (PST) Message-ID: <03dcdd53-77f4-1d66-3b78-d6c8b469456d@linaro.org> Date: Mon, 7 Mar 2022 09:10:17 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: Re: [PATCH v4 1/4] iconv: Always encode "optional direct" UTF-7 characters Content-Language: en-US To: Max Gautier , libc-alpha@sourceware.org References: <87blcw9ptq.fsf@oldenburg.str.redhat.com> <20211209093152.313872-1-mg@max.gautier.name> <20211209093152.313872-2-mg@max.gautier.name> From: Adhemerval Zanella In-Reply-To: <20211209093152.313872-2-mg@max.gautier.name> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, 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-List-Received-Date: Mon, 07 Mar 2022 12:10:22 -0000 On 09/12/2021 06:31, Max Gautier via Libc-alpha wrote: > Signed-off-by: Max Gautier LGTM, thanks. Reviewed-by: Adhemerval Zanella > --- > iconvdata/utf-7.c | 12 ++---------- > 1 file changed, 2 insertions(+), 10 deletions(-) > > diff --git a/iconvdata/utf-7.c b/iconvdata/utf-7.c > index 0ed46c948d..9ba0974959 100644 > --- a/iconvdata/utf-7.c > +++ b/iconvdata/utf-7.c > @@ -29,14 +29,6 @@ > #include > > > -/* Define this to 1 if you want the so-called "optional direct" characters > - ! " # $ % & * ; < = > @ [ ] ^ _ ` { | } > - to be encoded. Define to 0 if you want them to be passed straight > - through, like the so-called "direct" characters. > - We set this to 1 because it's safer. > - */ > -#define UTF7_ENCODE_OPTIONAL_CHARS 1 > - > > /* The set of "direct characters": > A-Z a-z 0-9 ' ( ) , - . / : ? space tab lf cr > @@ -323,7 +315,7 @@ base64 (unsigned int i) > if ((statep->__count & 0x18) == 0) \ > { \ > /* base64 encoding inactive */ \ > - if (UTF7_ENCODE_OPTIONAL_CHARS ? isdirect (ch) : isxdirect (ch)) \ > + if (isdirect (ch)) \ > { \ > *outptr++ = (unsigned char) ch; \ > } \ > @@ -375,7 +367,7 @@ base64 (unsigned int i) > else \ > { \ > /* base64 encoding active */ \ > - if (UTF7_ENCODE_OPTIONAL_CHARS ? isdirect (ch) : isxdirect (ch)) \ > + if (isdirect (ch)) \ > { \ > /* deactivate base64 encoding */ \ > size_t count; \