From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id EECB93857404; Mon, 21 Mar 2022 18:04:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EECB93857404 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc] iconv: Always encode "optional direct" UTF-7 characters X-Act-Checkin: glibc X-Git-Author: Max Gautier X-Git-Refname: refs/heads/master X-Git-Oldrev: 59c30d5708e4bfc1510176222f7772fe800ff9d2 X-Git-Newrev: cd08388523c60c0b9270298699d769f16598ef88 Message-Id: <20220321180446.EECB93857404@sourceware.org> Date: Mon, 21 Mar 2022 18:04:46 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Mar 2022 18:04:47 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=cd08388523c60c0b9270298699d769f16598ef88 commit cd08388523c60c0b9270298699d769f16598ef88 Author: Max Gautier Date: Thu Dec 9 10:31:49 2021 +0100 iconv: Always encode "optional direct" UTF-7 characters Signed-off-by: Max Gautier Reviewed-by: Adhemerval Zanella Diff: --- 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 255cc15bbf..b5af9b217c 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; \