Put file-creating fopen() calls in content-scanning code in a wrapper

[exim.git] / src / src / spool_mbox.c

diff --git a/src/src/spool_mbox.c b/src/src/spool_mbox.c
index 70926811d0ad79d02388efe62b802bdfa3bc483a..008ff26e68d1c704ff76ab7628526932f0b5db22 100644 (file)
--- a/src/src/spool_mbox.c
+++ b/src/src/spool_mbox.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/spool_mbox.c,v 1.7 2005/06/27 14:29:44 ph10 Exp $ */
+/* $Cambridge: exim/src/src/spool_mbox.c,v 1.11 2006/02/22 14:46:44 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -48,15 +48,15 @@ FILE *spool_mbox(unsigned long *mbox_file_size) {
     };
 
     /* create temp directory inside scan dir */
-    snprintf(CS mbox_path, 1024, "%s/scan/%s", spool_directory, message_id);
+    (void)string_format(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");
+    (void)string_format(mbox_path, 1024, "%s/scan/%s/%s.eml", spool_directory, message_id, message_id);
+    mbox_file = modefopen(mbox_path,"wb",SPOOL_MODE);
 
     if (mbox_file == NULL) {
       debug_printf("unable to open file for writing: %s\n", mbox_path);
@@ -129,15 +129,27 @@ FILE *spool_mbox(unsigned long *mbox_file_size) {
     for (i = 0; i < 2; i++) {
       message_subdir[0] = (split_spool_directory == (i == 0))? message_id[5] : 0;
       sprintf(CS mbox_path, "%s/input/%s/%s-D", spool_directory, message_subdir, message_id);
-      data_file = Ufopen(mbox_path,"r");
+      data_file = Ufopen(mbox_path,"rb");
       if (data_file != NULL)
         break;
     };
 
-    (void)fread(data_buffer, 1, 18, data_file);
+    /* The code used to use this line, but it doesn't work in Cygwin.
+     *
+     *  (void)fread(data_buffer, 1, 18, data_file);
+     *
+     * What's happening is that spool_mbox used to use an fread to jump over the
+     * file header. That fails under Cygwin because the header is locked, but
+     * doing an fseek succeeds. We have to output the leading newline
+     * explicitly, because the one in the file is parted of the locked area.
+     */
+
+    (void)fwrite("\n", 1, 1, mbox_file);
+    (void)fseek(data_file, SPOOL_DATA_START_OFFSET, SEEK_SET);
 
     do {
       j = fread(data_buffer, 1, sizeof(data_buffer), data_file);
+
       if (j > 0) {
         i = fwrite(data_buffer, 1, j, mbox_file);
         if (i != j) {
@@ -155,14 +167,14 @@ FILE *spool_mbox(unsigned long *mbox_file_size) {
     spool_mbox_ok = 1;
   };
 
-  snprintf(CS mbox_path, 1024, "%s/scan/%s/%s.eml", spool_directory, message_id, message_id);
+  (void)string_format(mbox_path, 1024, "%s/scan/%s/%s.eml", spool_directory, message_id, message_id);
 
   /* get the size of the mbox message */
   stat(CS mbox_path, &statbuf);
   *mbox_file_size = statbuf.st_size;
 
   /* open [message_id].eml file for reading */
-  mbox_file = Ufopen(mbox_path,"r");
+  mbox_file = Ufopen(mbox_path,"rb");
 
   return mbox_file;
 }
@@ -192,7 +204,7 @@ void unspool_mbox(void) {
       struct dirent *entry;
       DIR *tempdir;
 
-      snprintf(CS mbox_path, 1024, "%s/scan/%s", spool_directory, spooled_message_id);
+      (void)string_format(mbox_path, 1024, "%s/scan/%s", spool_directory, spooled_message_id);
 
   tempdir = opendir(CS mbox_path);
   /* loop thru dir & delete entries */
@@ -200,7 +212,7 @@ void unspool_mbox(void) {
   do {
     entry = readdir(tempdir);
     if (entry == NULL) break;
-    snprintf(CS file_path, 1024,"%s/scan/%s/%s", spool_directory, spooled_message_id, entry->d_name);
+    (void)string_format(file_path, 1024,"%s/scan/%s/%s", spool_directory, spooled_message_id, entry->d_name);
     if ( (Ustrcmp(entry->d_name,"..") != 0) && (Ustrcmp(entry->d_name,".") != 0) ) {
       debug_printf("unspool_mbox(): unlinking '%s'\n", file_path);
               n = unlink(CS file_path);