Added lots of "(void)" casts to standard function calls.

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

diff --git a/src/src/spool_mbox.c b/src/src/spool_mbox.c
index 5cdc9d3a75cead1862887ed773d64c0bb6e37b69..70926811d0ad79d02388efe62b802bdfa3bc483a 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.4 2005/02/17 11:58:26 ph10 Exp $ */
+/* $Cambridge: exim/src/src/spool_mbox.c,v 1.7 2005/06/27 14:29:44 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -36,6 +36,9 @@ FILE *spool_mbox(unsigned long *mbox_file_size) {
   header_line *my_headerlist;
   struct stat statbuf;
   int i,j;
+  uschar *mbox_delimiter;
+  uschar *envelope_from;
+  uschar *envelope_to;
 
   if (!spool_mbox_ok) {
     /* create scan directory, if not present */
@@ -60,6 +63,47 @@ FILE *spool_mbox(unsigned long *mbox_file_size) {
       return NULL;
     };
 
+    /* Generate mailbox delimiter */
+    mbox_delimiter = expand_string(US"From ${sender_address} ${tod_bsdinbox}\n");
+    if (mbox_delimiter != NULL) {
+      if (mbox_delimiter[0] != 0) {
+        i = fwrite(mbox_delimiter, 1, Ustrlen(mbox_delimiter), mbox_file);
+        if (i != Ustrlen(mbox_delimiter)) {
+          debug_printf("error/short write on writing in: %s", mbox_path);
+          (void)fclose(mbox_file);
+          return NULL;
+        };
+      };
+    };
+    /* Generate X-Envelope-From header */
+    envelope_from = expand_string(US"${sender_address}");
+    if (envelope_from != NULL) {
+      if (envelope_from[0] != 0) {
+        uschar *my_envelope_from;
+        my_envelope_from = string_sprintf("X-Envelope-From: <%s>\n", envelope_from);
+        i = fwrite(my_envelope_from, 1, Ustrlen(my_envelope_from), mbox_file);
+        if (i != Ustrlen(my_envelope_from)) {
+          debug_printf("error/short write on writing in: %s", mbox_path);
+          (void)fclose(mbox_file);
+          return NULL;
+        };
+      };
+    };
+    /* Generate X-Envelope-To header */
+    envelope_to = expand_string(US"${if def:received_for{$received_for}}");
+    if (envelope_to != NULL) {
+      if (envelope_to[0] != 0) {
+        uschar *my_envelope_to;
+        my_envelope_to = string_sprintf("X-Envelope-To: <%s>\n", envelope_to);
+        i = fwrite(my_envelope_to, 1, Ustrlen(my_envelope_to), mbox_file);
+        if (i != Ustrlen(my_envelope_to)) {
+          debug_printf("error/short write on writing in: %s", mbox_path);
+          (void)fclose(mbox_file);
+          return NULL;
+        };
+      };
+    };
+
     /* write all header lines to mbox file */
     my_headerlist = header_list;
     while (my_headerlist != NULL) {
@@ -73,7 +117,7 @@ FILE *spool_mbox(unsigned long *mbox_file_size) {
       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);
+        (void)fclose(mbox_file);
         return NULL;
       };
 
@@ -90,7 +134,7 @@ FILE *spool_mbox(unsigned long *mbox_file_size) {
         break;
     };
 
-    fread(data_buffer, 1, 18, data_file);
+    (void)fread(data_buffer, 1, 18, data_file);
 
     do {
       j = fread(data_buffer, 1, sizeof(data_buffer), data_file);
@@ -98,15 +142,15 @@ FILE *spool_mbox(unsigned long *mbox_file_size) {
         i = fwrite(data_buffer, 1, j, mbox_file);
         if (i != j) {
           debug_printf("error/short write on writing in: %s", mbox_path);
-          fclose(mbox_file);
-          fclose(data_file);
+          (void)fclose(mbox_file);
+          (void)fclose(data_file);
           return NULL;
         };
       };
     } while (j > 0);
 
-    fclose(data_file);
-    fclose(mbox_file);
+    (void)fclose(data_file);
+    (void)fclose(mbox_file);
     Ustrcpy(spooled_message_id, message_id);
     spool_mbox_ok = 1;
   };
@@ -150,23 +194,23 @@ void unspool_mbox(void) {
 
       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;
-       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);
-         if ( (Ustrcmp(entry->d_name,"..") != 0) && (Ustrcmp(entry->d_name,".") != 0) ) {
-           debug_printf("unspool_mbox(): unlinking '%s'\n", file_path);
+  tempdir = opendir(CS mbox_path);
+  /* loop thru dir & delete entries */
+  n = 0;
+  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);
+    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);
+  } while (n > -1);
 
-       closedir(tempdir);
+  closedir(tempdir);
 
-       /* remove directory */
-       n = rmdir(CS mbox_path);
+  /* remove directory */
+  n = rmdir(CS mbox_path);
     };
   };
 }