(1) Last-minute sieve patch (updates to latest spec).

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

diff --git a/src/src/spool_mbox.c b/src/src/spool_mbox.c
index bcad172206d35f73b8ba0e1121837cb56e02c1d7..5cdc9d3a75cead1862887ed773d64c0bb6e37b69 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.3 2004/12/17 14:52:44 ph10 Exp $ */
+/* $Cambridge: exim/src/src/spool_mbox.c,v 1.4 2005/02/17 11:58:26 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -36,50 +36,50 @@ FILE *spool_mbox(unsigned long *mbox_file_size) {
   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 */
     message_subdir[1] = '\0';
     for (i = 0; i < 2; i++) {
@@ -91,7 +91,7 @@ FILE *spool_mbox(unsigned long *mbox_file_size) {
     };
 
     fread(data_buffer, 1, 18, data_file);
-    
+
     do {
       j = fread(data_buffer, 1, sizeof(data_buffer), data_file);
       if (j > 0) {
@@ -104,7 +104,7 @@ FILE *spool_mbox(unsigned long *mbox_file_size) {
         };
       };
     } while (j > 0);
-    
+
     fclose(data_file);
     fclose(mbox_file);
     Ustrcpy(spooled_message_id, message_id);
@@ -119,7 +119,7 @@ FILE *spool_mbox(unsigned long *mbox_file_size) {
 
   /* open [message_id].eml file for reading */
   mbox_file = Ufopen(mbox_path,"r");
-  
+
   return mbox_file;
 }
 
@@ -133,23 +133,23 @@ void unspool_mbox(void) {
   demime_reason = NULL;
   file_extensions = NULL;
   #endif
-  
+
   spam_ok = 0;
   malware_ok = 0;
-  
+
   if (spool_mbox_ok) {
 
     spool_mbox_ok = 0;
-    
+
     if (!no_mbox_unspool) {
       uschar mbox_path[1024];
       uschar file_path[1024];
       int n;
       struct dirent *entry;
       DIR *tempdir;
-      
+
       snprintf(CS mbox_path, 1024, "%s/scan/%s", spool_directory, spooled_message_id);
-       
+
        tempdir = opendir(CS mbox_path);
        /* loop thru dir & delete entries */
        n = 0;
@@ -160,11 +160,11 @@ void unspool_mbox(void) {
          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);
-            }; 
+            };
        } while (n > -1);
-       
+
        closedir(tempdir);
-       
+
        /* remove directory */
        n = rmdir(CS mbox_path);
     };