Logging: fix syslog logging for syslog_timestamp=no and log_selector +millisec

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

diff --git a/src/src/spool_mbox.c b/src/src/spool_mbox.c
index 8ca468a856253bc8b5d1cbaacd5ef4da5745292a..749484f2b0974bd891dffaf847033731de4f7b4d 100644 (file)
--- a/src/src/spool_mbox.c
+++ b/src/src/spool_mbox.c
@@ -4,7 +4,7 @@
 
 /* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2003 - 2015
  * License: GPL
- * Copyright (c) The Exim Maintainers 2016
+ * Copyright (c) The Exim Maintainers 2016 - 2018
  */
 
 /* Code for setting up a MBOX style spool file inside a /scan/<msgid>
@@ -132,7 +132,7 @@ if (!spool_mbox_ok)
   /* 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
@@ -148,7 +148,7 @@ if (!spool_mbox_ok)
     if (!spool_file_wireformat || source_file_override)
       j = fread(buffer, 1, sizeof(buffer), data_file);
     else                                               /* needs CRLF -> NL */
-      if ((s = fgets(buffer, sizeof(buffer), data_file)))
+      if ((s = US fgets(CS buffer, sizeof(buffer), data_file)))
        {
        uschar * p = s + Ustrlen(s) - 1;
 
@@ -216,8 +216,7 @@ if (spool_mbox_ok && !no_mbox_unspool)
 
   mbox_path = string_sprintf("%s/scan/%s", spool_directory, spooled_message_id);
 
-  tempdir = opendir(CS mbox_path);
-  if (!tempdir)
+  if (!(tempdir = opendir(CS mbox_path)))
     {
     debug_printf("Unable to opendir(%s): %s\n", mbox_path, strerror(errno));
     /* Just in case we still can: */
@@ -225,7 +224,7 @@ if (spool_mbox_ok && !no_mbox_unspool)
     return;
     }
   /* loop thru dir & delete entries */
-  while((entry = readdir(tempdir)) != NULL)
+  while((entry = readdir(tempdir)))
     {
     uschar *name = US entry->d_name;
     int dummy;
@@ -233,7 +232,7 @@ if (spool_mbox_ok && !no_mbox_unspool)
 
     file_path = string_sprintf("%s/%s", mbox_path, name);
     debug_printf("unspool_mbox(): unlinking '%s'\n", file_path);
-    dummy = unlink(CS file_path);
+    dummy = unlink(CS file_path); dummy = dummy;       /* compiler quietening */
     }
 
   closedir(tempdir);