}
+static uschar *
+rfc2231_to_2047(const uschar * fname, const uschar * charset, int * len)
+{
+int size = 0, ptr = 0;
+uschar * val = string_cat(NULL, &size, &ptr, US"=?", 2);
+uschar c;
+
+val = string_cat(val, &size, &ptr, charset, Ustrlen(charset));
+val = string_cat(val, &size, &ptr, US"?Q?", 3);
+
+while ((c = *fname))
+ if (c == '%' && isxdigit(fname[1]) && isxdigit(fname[2]))
+ {
+ val = string_cat(val, &size, &ptr, US"=", 1);
+ val = string_cat(val, &size, &ptr, ++fname, 2);
+ fname += 2;
+ }
+ else
+ val = string_cat(val, &size, &ptr, fname++, 1);
+
+val = string_cat(val, &size, &ptr, US"?=", 2);
+val[*len = ptr] = '\0';
+return val;
+}
+
+
int
mime_acl_check(uschar *acl, FILE *f, struct mime_boundary_context *context,
uschar **user_msgptr, uschar **log_msgptr)
mh < mime_header_list + mime_header_list_size;
mh++) if (strncmpic(mh->name, header, mh->namelen) == 0)
{
- uschar * header_value = NULL;
- int header_value_len = 0;
uschar * p = header + mh->namelen;
uschar * q;
DEBUG(D_acl) debug_printf(" considering paramlist '%s'\n", p);
if ( !mime_filename
- && strncmpic("content-disposition:", header, 20) == 0
- && strncmpic("filename*", p, 9) == 0
+ && strncmpic(CUS"content-disposition:", header, 20) == 0
+ && strncmpic(CUS"filename*", p, 9) == 0
)
{ /* RFC 2231 filename */
uschar * q;
else
p = q;
- temp_string = expand_string(string_sprintf(
- "=?%s?Q?${sg{%s}{\\N%%([\\dA-Fa-f]{2})\\N}{=\\$1}}?=",
- mime_filename_charset, p));
- slen = Ustrlen(temp_string);
-
+ temp_string = rfc2231_to_2047(p, mime_filename_charset, &slen);
temp_string = rfc2047_decode(temp_string, FALSE, NULL, 32,
NULL, &err_msg);
size = Ustrlen(temp_string);
if (*p) p++;
} /* param scan on line */
- if (strncmpic("content-disposition:", header, 20) == 0)
+ if (strncmpic(CUS"content-disposition:", header, 20) == 0)
{
if (decoding_failed) mime_filename = mime_fname_rfc2231;