From: Tony Finch Date: Fri, 12 Oct 2012 13:52:28 +0000 (+0100) Subject: ${hexquote: expansion operator X-Git-Tag: exim-4_82_RC1~27 X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/c393f9312e022187f24bc9536e9d3ea426009ea0 ${hexquote: expansion operator This converts octets outside the range 0x21-0x7E (the ASCII graphic characters) to \xNN hex escapes. --- diff --git a/src/src/expand.c b/src/src/expand.c index 391b943cf..1da222563 100644 --- a/src/src/expand.c +++ b/src/src/expand.c @@ -181,6 +181,7 @@ static uschar *op_table_main[] = { US"h", US"hash", US"hex2b64", + US"hexquote", US"l", US"lc", US"length", @@ -216,6 +217,7 @@ enum { EOP_H, EOP_HASH, EOP_HEX2B64, + EOP_HEXQUOTE, EOP_L, EOP_LC, EOP_LENGTH, @@ -5664,6 +5666,22 @@ while (*s != 0) continue; } + /* Convert octets outside 0x21..0x7E to \xXX form */ + + case EOP_HEXQUOTE: + { + uschar *t = sub - 1; + while (*(++t) != 0) + { + if (*t < 0x21 || 0x7E < *t) + yield = string_cat(yield, &size, &ptr, + string_sprintf("\\x%02x", *t), 4); + else + yield = string_cat(yield, &size, &ptr, t, 1); + } + continue; + } + /* count the number of list elements */ case EOP_LISTCOUNT: