X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/b07e6aa3aa6749ab57c214efd155bb29614394eb..e0df1c8324f0e0c4112302fa473cff6a6110a044:/src/src/demime.c diff --git a/src/src/demime.c b/src/src/demime.c index 0ab787741..887678db3 100644 --- a/src/src/demime.c +++ b/src/src/demime.c @@ -1,5 +1,3 @@ -/* $Cambridge: exim/src/src/demime.c,v 1.8 2005/08/01 14:41:25 ph10 Exp $ */ - /************************************************* * Exim - an Internet mail transport agent * *************************************************/ @@ -47,7 +45,7 @@ int demime(uschar **listptr) { }; /* make sure the eml mbox file is spooled up */ - mbox_file = spool_mbox(&mbox_size); + mbox_file = spool_mbox(&mbox_size, NULL); if (mbox_file == NULL) { /* error while spooling */ @@ -256,7 +254,7 @@ int mime_get_dump_file(uschar *extension, FILE **f, uschar *info) { } while(result != -1); - *f = fopen(CS file_name,"wb+"); + *f = modefopen(file_name,"wb+",SPOOL_MODE); if (*f == NULL) { /* cannot open new dump file, disk full ? -> soft error */ (void)string_format(info, 1024,"unable to open dump file"); @@ -823,7 +821,7 @@ void mime_trigger_error(int level, uschar *format, ...) { (void)string_vformat(US f, 16383,(char *)format, ap); va_end(ap); f-=22; - log_write(0, LOG_MAIN, f); + log_write(0, LOG_MAIN, "%s", f); /* then copy to demime_reason_buffer if new level is greater than old level */ if (level > demime_errorlevel) {