public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Adhemerval Zanella <azanella@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc/azanella/imap-utf7] iconv: Always encode "optional direct" UTF-7 characters Date: Mon, 21 Mar 2022 12:26:51 +0000 (GMT) [thread overview] Message-ID: <20220321122651.BB7E0385E44A@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=cd08388523c60c0b9270298699d769f16598ef88 commit cd08388523c60c0b9270298699d769f16598ef88 Author: Max Gautier <mg@max.gautier.name> Date: Thu Dec 9 10:31:49 2021 +0100 iconv: Always encode "optional direct" UTF-7 characters Signed-off-by: Max Gautier <mg@max.gautier.name> Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> 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 <stdlib.h> -/* 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; \
reply other threads:[~2022-03-21 12:26 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20220321122651.BB7E0385E44A@sourceware.org \ --to=azanella@sourceware.org \ --cc=glibc-cvs@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: linkBe 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).