-uschar spooled_message_id[17];
-
-/* returns a pointer to the FILE, and puts the size in bytes into mbox_file_size */
-
-FILE *spool_mbox(unsigned long *mbox_file_size) {
- uschar mbox_path[1024];
- uschar message_subdir[2];
- uschar data_buffer[65535];
- FILE *mbox_file;
- FILE *data_file = NULL;
- header_line *my_headerlist;
- struct stat statbuf;
- int i,j;
-
- if (!spool_mbox_ok) {
- /* create scan directory, if not present */
- if (!directory_make(spool_directory, US "scan", 0750, FALSE)) {
- debug_printf("unable to create directory: %s/scan\n", spool_directory);
- return NULL;
- };
-
- /* create temp directory inside scan dir */
- snprintf(CS mbox_path, 1024, "%s/scan/%s", spool_directory, message_id);
- if (!directory_make(NULL, mbox_path, 0750, FALSE)) {
- debug_printf("unable to create directory: %s/scan/%s\n", spool_directory, message_id);
- return NULL;
- };
-
- /* open [message_id].eml file for writing */
- snprintf(CS mbox_path, 1024, "%s/scan/%s/%s.eml", spool_directory, message_id, message_id);
- mbox_file = Ufopen(mbox_path,"w");
-
- if (mbox_file == NULL) {
- debug_printf("unable to open file for writing: %s\n", mbox_path);
- return NULL;
- };
-
- /* write all header lines to mbox file */
- my_headerlist = header_list;
- while (my_headerlist != NULL) {
-
- /* skip deleted headers */
- if (my_headerlist->type == '*') {
- my_headerlist = my_headerlist->next;
- continue;
- };
-
- i = fwrite(my_headerlist->text, 1, my_headerlist->slen, mbox_file);
- if (i != my_headerlist->slen) {
- debug_printf("error/short write on writing in: %s", mbox_path);
- fclose(mbox_file);
- return NULL;
- };
-
- my_headerlist = my_headerlist->next;
- };
-
- /* copy body file */
+uschar spooled_message_id[MESSAGE_ID_LENGTH+1];
+
+/*
+Create an MBOX-style message file from the spooled files.
+
+Returns a pointer to the FILE, and puts the size in bytes into mbox_file_size.
+If mbox_fname is non-null, fill in a pointer to the name.
+Normally, source_file_override is NULL
+*/
+
+FILE *
+spool_mbox(unsigned long *mbox_file_size, const uschar *source_file_override,
+ uschar ** mbox_fname)
+{
+uschar message_subdir[2];
+uschar buffer[16384];
+uschar *temp_string;
+uschar *mbox_path;
+FILE *mbox_file = NULL, *l_data_file = NULL, *yield = NULL;
+struct stat statbuf;
+int j;
+rmark reset_point;
+
+mbox_path = string_sprintf("%s/scan/%s/%s.eml",
+ spool_directory, message_id, message_id);
+if (mbox_fname) *mbox_fname = mbox_path;
+
+reset_point = store_mark();
+
+/* Skip creation if already spooled out as mbox file */
+if (!spool_mbox_ok)
+ {
+ /* create temp directory inside scan dir, directory_make works recursively */
+ temp_string = string_sprintf("scan/%s", message_id);
+ if (!directory_make(spool_directory, temp_string, 0750, FALSE))
+ {
+ log_write(0, LOG_MAIN|LOG_PANIC, "%s",
+ string_open_failed("scan directory %s/scan/%s", spool_directory, temp_string));
+ goto OUT;
+ }
+
+ /* open [message_id].eml file for writing */
+
+ if (!(mbox_file = modefopen(mbox_path, "wb", SPOOL_MODE)))
+ {
+ log_write(0, LOG_MAIN|LOG_PANIC, "%s",
+ string_open_failed("scan file %s", mbox_path));
+ goto OUT;
+ }
+
+ /* Generate mailbox headers. The $received_for variable is (up to at least
+ Exim 4.64) never set here, because it is only set when expanding the
+ contents of the Received: header line. However, the code below will use it
+ if it should become available in future. */
+
+ temp_string = expand_string(
+ US"From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox}\n"
+ "${if def:sender_address{X-Envelope-From: <${sender_address}>\n}}"
+ "${if def:recipients{X-Envelope-To: ${recipients}\n}}");
+
+ if (temp_string)
+ if (fwrite(temp_string, Ustrlen(temp_string), 1, mbox_file) != 1)
+ {
+ log_write(0, LOG_MAIN|LOG_PANIC, "Error/short write while writing \
+ mailbox headers to %s", mbox_path);
+ goto OUT;
+ }
+
+ /* write all non-deleted header lines to mbox file */
+
+ for (header_line * my_headerlist = header_list; my_headerlist;
+ my_headerlist = my_headerlist->next)
+ if (my_headerlist->type != '*')
+ if (fwrite(my_headerlist->text, my_headerlist->slen, 1, mbox_file) != 1)
+ {
+ log_write(0, LOG_MAIN|LOG_PANIC, "Error/short write while writing \
+ message headers to %s", mbox_path);
+ goto OUT;
+ }
+
+ /* End headers */
+ if (fwrite("\n", 1, 1, mbox_file) != 1)
+ {
+ log_write(0, LOG_MAIN|LOG_PANIC, "Error/short write while writing \
+ message headers to %s", mbox_path);
+ goto OUT;
+ }
+
+ /* Copy body file. If the main receive still has it open then it is holding
+ a lock, and we must not close it (which releases the lock), so just use the
+ global file handle. */
+ if (source_file_override)
+ l_data_file = Ufopen(source_file_override, "rb");
+ else if (spool_data_file)
+ l_data_file = spool_data_file;
+ else
+ {