diff options
| author | Max Gautier <mg@max.gautier.name> | 2021-12-09 10:31:49 +0100 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2022-03-21 09:25:43 -0300 |
| commit | cd08388523c60c0b9270298699d769f16598ef88 (patch) | |
| tree | 3910e4171383818deacabf63ecf8915d899a0e3e /iconvdata/utf-7.c | |
| parent | 59c30d5708e4bfc1510176222f7772fe800ff9d2 (diff) | |
| download | glibc-cd08388523c60c0b9270298699d769f16598ef88.tar.gz | |
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>
Diffstat (limited to 'iconvdata/utf-7.c')
| -rw-r--r-- | iconvdata/utf-7.c | 12 |
1 files 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; \ |