git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Callouts: a "hold" option for receipient-verify, which keeps the connection open...
[exim.git]
/
src
/
src
/
mime.c
diff --git
a/src/src/mime.c
b/src/src/mime.c
index 089ee995490403927c39ce34e948ab152475017d..821cb541d8ea42ded344a04c87e0fdef81335f1f 100644
(file)
--- a/
src/src/mime.c
+++ b/
src/src/mime.c
@@
-188,21
+188,17
@@
return size;
}
}
+/*
+ * Return open filehandle for combo of path and file.
+ * Side-effect: set mime_decoded_filename, to copy in allocated mem
+ */
static FILE *
mime_get_decode_file(uschar *pname, uschar *fname)
{
static FILE *
mime_get_decode_file(uschar *pname, uschar *fname)
{
-FILE *f = NULL;
-uschar *filename;
-
-filename = (uschar *)malloc(2048);
-
if (pname && fname)
if (pname && fname)
- {
- (void)string_format(filename, 2048, "%s/%s", pname, fname);
- f = modefopen(filename,"wb+",SPOOL_MODE);
- }
+ mime_decoded_filename = string_sprintf("%s/%s", pname, fname);
else if (!pname)
else if (!pname)
-
f = modefopen(fname,"wb+",SPOOL_MODE
);
+
mime_decoded_filename = string_copy(fname
);
else if (!fname)
{
int file_nr = 0;
else if (!fname)
{
int file_nr = 0;
@@
-212,21
+208,15
@@
else if (!fname)
do
{
struct stat mystat;
do
{
struct stat mystat;
- (void)string_format(filename, 2048,
- "%s/%s-%05u", pname, message_id, file_nr++);
+ mime_decoded_filename = string_sprintf("%s/%s-%05u", pname, message_id, file_nr++);
/* security break */
if (file_nr >= 1024)
break;
/* security break */
if (file_nr >= 1024)
break;
- result = stat(CS filename, &mystat);
+ result = stat(CS
mime_decoded_
filename, &mystat);
} while(result != -1);
} while(result != -1);
-
- f = modefopen(filename, "wb+", SPOOL_MODE);
}
}
-/* set expansion variable */
-mime_decoded_filename = filename;
-
-return f;
+return modefopen(mime_decoded_filename, "wb+", SPOOL_MODE);
}
}
@@
-243,11
+233,9
@@
long f_pos = 0;
ssize_t size_counter = 0;
ssize_t (*decode_function)(FILE*, FILE*, uschar*);
ssize_t size_counter = 0;
ssize_t (*decode_function)(FILE*, FILE*, uschar*);
-if (
mime_stream == NULL
)
+if (
!mime_stream || (f_pos = ftell(mime_stream)) < 0
)
return FAIL;
return FAIL;
-f_pos = ftell(mime_stream);
-
/* build default decode path (will exist since MBOX must be spooled up) */
(void)string_format(decode_path,1024,"%s/scan/%s",spool_directory,message_id);
/* build default decode path (will exist since MBOX must be spooled up) */
(void)string_format(decode_path,1024,"%s/scan/%s",spool_directory,message_id);
@@
-257,7
+245,7
@@
if ((option = string_nextinlist(&list, &sep,
sizeof(option_buffer))) != NULL)
{
/* parse 1st option */
sizeof(option_buffer))) != NULL)
{
/* parse 1st option */
- if (
(Ustrcmp(option,"false") == 0) || (Ustrcmp(option,"0") == 0)
)
+ if (
(Ustrcmp(option,"false") == 0) || (Ustrcmp(option,"0") == 0)
)
/* explicitly no decoding */
return FAIL;
/* explicitly no decoding */
return FAIL;
@@
-458,18
+446,18
@@
uschar * s = *sp;
uschar * val = NULL;
int size = 0, ptr = 0;
uschar * val = NULL;
int size = 0, ptr = 0;
-/* debug_printf(" considering paramval '%s'\n", s); */
+/* debug_printf
_indent
(" considering paramval '%s'\n", s); */
while (*s && *s != ';') /* ; terminates */
if (*s == '"')
{
s++; /* skip opening " */
while (*s && *s != '"') /* " protects ; */
while (*s && *s != ';') /* ; terminates */
if (*s == '"')
{
s++; /* skip opening " */
while (*s && *s != '"') /* " protects ; */
- val = string_cat(val, &size, &ptr, s++, 1);
+ val = string_cat
n
(val, &size, &ptr, s++, 1);
if (*s) s++; /* skip closing " */
}
else
if (*s) s++; /* skip closing " */
}
else
- val = string_cat(val, &size, &ptr, s++, 1);
+ val = string_cat
n
(val, &size, &ptr, s++, 1);
if (val) val[ptr] = '\0';
*sp = s;
return val;
if (val) val[ptr] = '\0';
*sp = s;
return val;
@@
-496,24
+484,24
@@
static uschar *
rfc2231_to_2047(const uschar * fname, const uschar * charset, int * len)
{
int size = 0, ptr = 0;
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 * val = string_cat
n
(NULL, &size, &ptr, US"=?", 2);
uschar c;
if (charset)
uschar c;
if (charset)
- val = string_cat(val, &size, &ptr, charset
, Ustrlen(charset)
);
-val = string_cat(val, &size, &ptr, US"?Q?", 3);
+ val = string_cat(val, &size, &ptr, charset);
+val = string_cat
n
(val, &size, &ptr, US"?Q?", 3);
while ((c = *fname))
if (c == '%' && isxdigit(fname[1]) && isxdigit(fname[2]))
{
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);
+ val = string_cat
n
(val, &size, &ptr, US"=", 1);
+ val = string_cat
n
(val, &size, &ptr, ++fname, 2);
fname += 2;
}
else
fname += 2;
}
else
- val = string_cat(val, &size, &ptr, fname++, 1);
+ val = string_cat
n
(val, &size, &ptr, fname++, 1);
-val = string_cat(val, &size, &ptr, US"?=", 2);
+val = string_cat
n
(val, &size, &ptr, US"?=", 2);
val[*len = ptr] = '\0';
return val;
}
val[*len = ptr] = '\0';
return val;
}
@@
-557,7
+545,7
@@
while(1)
if (!fgets(CS header, MIME_MAX_HEADER_SIZE, f))
{
/* Hit EOF or read error. Ugh. */
if (!fgets(CS header, MIME_MAX_HEADER_SIZE, f))
{
/* Hit EOF or read error. Ugh. */
- DEBUG(D_acl) debug_printf("MIME: Hit EOF ...\n");
+ DEBUG(D_acl) debug_printf
_indent
("MIME: Hit EOF ...\n");
return rc;
}
return rc;
}
@@
-569,12
+557,12
@@
while(1)
if (Ustrncmp((header+2+Ustrlen(context->boundary)), "--", 2) == 0)
{
/* END boundary found */
if (Ustrncmp((header+2+Ustrlen(context->boundary)), "--", 2) == 0)
{
/* END boundary found */
- DEBUG(D_acl) debug_printf("MIME: End boundary found %s\n",
+ DEBUG(D_acl) debug_printf
_indent
("MIME: End boundary found %s\n",
context->boundary);
return rc;
}
context->boundary);
return rc;
}
- DEBUG(D_acl) debug_printf("MIME: Next part with boundary %s\n",
+ DEBUG(D_acl) debug_printf
_indent
("MIME: Next part with boundary %s\n",
context->boundary);
break;
}
context->boundary);
break;
}
@@
-598,7
+586,7
@@
while(1)
for (q = p; *q != ';' && *q; q++) ;
*mh->value = string_copynlc(p, q-p);
for (q = p; *q != ';' && *q; q++) ;
*mh->value = string_copynlc(p, q-p);
- DEBUG(D_acl) debug_printf("MIME: found %s header, value is '%s'\n",
+ DEBUG(D_acl) debug_printf
_indent
("MIME: found %s header, value is '%s'\n",
mh->name, *mh->value);
if (*(p = q)) p++; /* jump past the ; */
mh->name, *mh->value);
if (*(p = q)) p++; /* jump past the ; */
@@
-616,7
+604,7
@@
while(1)
{
mime_parameter * mp;
{
mime_parameter * mp;
- DEBUG(D_acl) debug_printf("MIME: considering paramlist '%s'\n", p);
+ DEBUG(D_acl) debug_printf
_indent
("MIME: considering paramlist '%s'\n", p);
if ( !mime_filename
&& strncmpic(CUS"content-disposition:", header, 20) == 0
if ( !mime_filename
&& strncmpic(CUS"content-disposition:", header, 20) == 0
@@
-661,15
+649,15
@@
while(1)
else
p = q;
else
p = q;
- DEBUG(D_acl) debug_printf("MIME: charset %s fname '%s'\n",
+ DEBUG(D_acl) debug_printf
_indent
("MIME: charset %s fname '%s'\n",
mime_filename_charset ? mime_filename_charset : US"<NULL>", p);
temp_string = rfc2231_to_2047(p, mime_filename_charset, &slen);
mime_filename_charset ? mime_filename_charset : US"<NULL>", p);
temp_string = rfc2231_to_2047(p, mime_filename_charset, &slen);
- DEBUG(D_acl) debug_printf("MIME: 2047-name %s\n", temp_string);
+ DEBUG(D_acl) debug_printf
_indent
("MIME: 2047-name %s\n", temp_string);
temp_string = rfc2047_decode(temp_string, FALSE, NULL, ' ',
NULL, &err_msg);
temp_string = rfc2047_decode(temp_string, FALSE, NULL, ' ',
NULL, &err_msg);
- DEBUG(D_acl) debug_printf("MIME: plain-name %s\n", temp_string);
+ DEBUG(D_acl) debug_printf
_indent
("MIME: plain-name %s\n", temp_string);
size = Ustrlen(temp_string);
size = Ustrlen(temp_string);
@@
-704,7
+692,7
@@
while(1)
? rfc2047_decode(q, check_rfc2047_length, NULL, 32, NULL,
&dummy_errstr)
: NULL;
? rfc2047_decode(q, check_rfc2047_length, NULL, 32, NULL,
&dummy_errstr)
: NULL;
- DEBUG(D_acl) debug_printf(
+ DEBUG(D_acl) debug_printf
_indent
(
"MIME: found %s parameter in %s header, value '%s'\n",
mp->name, mh->name, *mp->value);
"MIME: found %s parameter in %s header, value '%s'\n",
mp->name, mh->name, *mp->value);
@@
-722,7
+710,7
@@
while(1)
{
if (decoding_failed) mime_filename = mime_fname_rfc2231;
{
if (decoding_failed) mime_filename = mime_fname_rfc2231;
- DEBUG(D_acl) debug_printf(
+ DEBUG(D_acl) debug_printf
_indent
(
"MIME: found %s parameter in %s header, value is '%s'\n",
"filename", mh->name, mime_filename);
}
"MIME: found %s parameter in %s header, value is '%s'\n",
"filename", mh->name, mime_filename);
}
@@
-765,7
+753,7
@@
while(1)
(Ustrncmp(mime_content_type,"multipart",9) == 0) )
{
DEBUG(D_acl)
(Ustrncmp(mime_content_type,"multipart",9) == 0) )
{
DEBUG(D_acl)
- debug_printf("MIME: Entering multipart recursion, boundary '%s'\n",
+ debug_printf
_indent
("MIME: Entering multipart recursion, boundary '%s'\n",
nested_context.boundary);
nested_context.context =
nested_context.boundary);
nested_context.context =
@@
-811,7
+799,7
@@
while(1)
if (!mime_decoded_filename) /* decoding failed */
{
log_write(0, LOG_MAIN,
if (!mime_decoded_filename) /* decoding failed */
{
log_write(0, LOG_MAIN,
- "
mime_regex
acl condition warning - could not decode RFC822 MIME part to file.");
+ "
MIME
acl condition warning - could not decode RFC822 MIME part to file.");
rc = DEFER;
goto out;
}
rc = DEFER;
goto out;
}