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

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

diff --git a/src/src/log.c b/src/src/log.c
index ddd71377e2f75bb335db55a2e37948af10b32e15..16f58d26b3c5db919175690f85a3c505644f34fe 100644 (file)
--- a/src/src/log.c
+++ b/src/src/log.c
@@ -2,7 +2,7 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 

-/* Copyright (c) University of Cambridge 1995 - 2016 */
+/* Copyright (c) University of Cambridge 1995 - 2018 */

 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions for writing log files. The code for maintaining datestamped
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions for writing log files. The code for maintaining datestamped


@@ -134,22 +134,27 @@ can get here if there is a failure to open the panic log.)
 
 Arguments:
   priority       syslog priority
 
 Arguments:
   priority       syslog priority

-  s              the string to be written, the string may be modified!
+  s              the string to be written

 
 Returns:         nothing
 */
 
 static void
 
 Returns:         nothing
 */
 
 static void

-write_syslog(int priority, uschar *s)
+write_syslog(int priority, const uschar *s)

 {
 int len, pass;
 int linecount = 0;
 
 if (running_in_test_harness) return;
 
 {
 int len, pass;
 int linecount = 0;
 
 if (running_in_test_harness) return;
 

-if (!syslog_timestamp) s += log_timezone? 26 : 20;

 if (!syslog_pid && LOGGING(pid))
 if (!syslog_pid && LOGGING(pid))

-    memmove(s + pid_position[0], s + pid_position[1], pid_position[1] - pid_position[0]);
+  s = string_sprintf("%.*s%s", (int)pid_position[0], s, s + pid_position[1]);
+if (!syslog_timestamp)
+  {
+  len = log_timezone ? 26 : 20;
+  if (LOGGING(millisec)) len += 4;
+  s += len;
+  }

 
 len = Ustrlen(s);
 
 
 len = Ustrlen(s);
 


@@ -172,7 +177,7 @@ for (pass = 0; pass < 2; pass++)
   {
   int i;
   int tlen;
   {
   int i;
   int tlen;

-  uschar *ss = s;
+  const uschar * ss = s;

   for (i = 1, tlen = len; tlen > 0; i++)
     {
     int plen = tlen;
   for (i = 1, tlen = len; tlen > 0; i++)
     {
     int plen = tlen;


@@ -223,16 +228,16 @@ Returns:     The function does not return
 static void
 die(uschar *s1, uschar *s2)
 {
 static void
 die(uschar *s1, uschar *s2)
 {

-if (s1 != NULL)
+if (s1)

   {
   write_syslog(LOG_CRIT, s1);
   {
   write_syslog(LOG_CRIT, s1);

-  if (debug_file != NULL) debug_printf("%s\n", s1);
+  if (debug_file) debug_printf("%s\n", s1);

   if (log_stderr != NULL && log_stderr != debug_file)
     fprintf(log_stderr, "%s\n", s1);
   }
 if (receive_call_bombout) receive_bomb_out(NULL, s2);  /* does not return */
 if (smtp_input) smtp_closedown(s2);
   if (log_stderr != NULL && log_stderr != debug_file)
     fprintf(log_stderr, "%s\n", s1);
   }
 if (receive_call_bombout) receive_bomb_out(NULL, s2);  /* does not return */
 if (smtp_input) smtp_closedown(s2);

-exim_exit(EXIT_FAILURE);
+exim_exit(EXIT_FAILURE, NULL);

 }
 
 
 }
 
 


@@ -272,7 +277,7 @@ if (fd < 0 && errno == ENOENT)
   *lastslash = 0;
   created = directory_make(NULL, name, LOG_DIRECTORY_MODE, FALSE);
   DEBUG(D_any) debug_printf("%s log directory %s\n",
   *lastslash = 0;
   created = directory_make(NULL, name, LOG_DIRECTORY_MODE, FALSE);
   DEBUG(D_any) debug_printf("%s log directory %s\n",

-    created? "created" : "failed to create", name);
+    created ? "created" : "failed to create", name);

   *lastslash = '/';
   if (created) fd = Uopen(name,
 #ifdef O_CLOEXEC
   *lastslash = '/';
   if (created) fd = Uopen(name,
 #ifdef O_CLOEXEC


@@ -391,7 +396,7 @@ it gets statted to see if it has been cycled. With a datestamp, the datestamp
 will be compared. The static slot for saving it is the same size as buffer,
 and the text has been checked above to fit, so this use of strcpy() is OK. */
 
 will be compared. The static slot for saving it is the same size as buffer,
 and the text has been checked above to fit, so this use of strcpy() is OK. */
 

-if (type == lt_main)
+if (type == lt_main && string_datestamp_offset >= 0)

   {
   Ustrcpy(mainlog_name, buffer);
   mainlog_datestamp = mainlog_name + string_datestamp_offset;
   {
   Ustrcpy(mainlog_name, buffer);
   mainlog_datestamp = mainlog_name + string_datestamp_offset;


@@ -399,7 +404,7 @@ if (type == lt_main)
 
 /* Ditto for the reject log */
 
 
 /* Ditto for the reject log */
 

-else if (type == lt_reject)
+else if (type == lt_reject && string_datestamp_offset >= 0)

   {
   Ustrcpy(rejectlog_name, buffer);
   rejectlog_datestamp = rejectlog_name + string_datestamp_offset;
   {
   Ustrcpy(rejectlog_name, buffer);
   rejectlog_datestamp = rejectlog_name + string_datestamp_offset;


@@ -446,10 +451,8 @@ else if (string_datestamp_offset >= 0)
 /* If the file name is too long, it is an unrecoverable disaster */
 
 if (!ok)
 /* If the file name is too long, it is an unrecoverable disaster */
 
 if (!ok)

-  {

   die(US"exim: log file path too long: aborting",
       US"Logging failure; please try later");
   die(US"exim: log file path too long: aborting",
       US"Logging failure; please try later");

-  }

 
 /* We now have the file name. Try to open an existing file. After a successful
 open, arrange for automatic closure on exec(), and then return. */
 
 /* We now have the file name. Try to open an existing file. After a successful
 open, arrange for automatic closure on exec(), and then return. */


@@ -559,10 +562,7 @@ if ((flags & (LOG_CONFIG_FOR & ~LOG_CONFIG)) != 0)
   }
 
 if ((flags & (LOG_CONFIG_IN & ~LOG_CONFIG)) != 0)
   }
 
 if ((flags & (LOG_CONFIG_IN & ~LOG_CONFIG)) != 0)

-  {
-  sprintf(CS ptr, " in line %d of %s", config_lineno, config_filename);
-  while (*ptr) ptr++;
-  }
+  ptr += sprintf(CS ptr, " in line %d of %s", config_lineno, config_filename);

 
 Ustrcpy(ptr, ":\n  ");
 return ptr + 4;
 
 Ustrcpy(ptr, ":\n  ");
 return ptr + 4;


@@ -736,7 +736,7 @@ Returns:    nothing
 void
 log_write(unsigned int selector, int flags, const char *format, ...)
 {
 void
 log_write(unsigned int selector, int flags, const char *format, ...)
 {

-uschar *ptr;
+uschar * ptr;

 int length;
 int paniclogfd;
 ssize_t written_len;
 int length;
 int paniclogfd;
 ssize_t written_len;


@@ -766,7 +766,7 @@ if (!log_buffer)
   if (!(log_buffer = US malloc(LOG_BUFFER_SIZE)))
     {
     fprintf(stderr, "exim: failed to get store for log buffer\n");
   if (!(log_buffer = US malloc(LOG_BUFFER_SIZE)))
     {
     fprintf(stderr, "exim: failed to get store for log buffer\n");

-    exim_exit(EXIT_FAILURE);
+    exim_exit(EXIT_FAILURE, NULL);

     }
 
 /* If we haven't already done so, inspect the setting of log_file_path to
     }
 
 /* If we haven't already done so, inspect the setting of log_file_path to


@@ -862,13 +862,12 @@ DEBUG(D_any|D_v)
       }
     }
 
       }
     }
 

-  sprintf(CS ptr, "%s%s%s%s\n  ",
+  ptr += sprintf(CS ptr, "%s%s%s%s\n  ",

     ((flags & LOG_MAIN) != 0)?    " MAIN"   : "",
     ((flags & LOG_PANIC) != 0)?   " PANIC"  : "",
     ((flags & LOG_PANIC_DIE) == LOG_PANIC_DIE)? " DIE" : "",
     ((flags & LOG_REJECT) != 0)?  " REJECT" : "");
 
     ((flags & LOG_MAIN) != 0)?    " MAIN"   : "",
     ((flags & LOG_PANIC) != 0)?   " PANIC"  : "",
     ((flags & LOG_PANIC_DIE) == LOG_PANIC_DIE)? " DIE" : "",
     ((flags & LOG_REJECT) != 0)?  " REJECT" : "");
 

-  while(*ptr) ptr++;

   if ((flags & LOG_CONFIG) != 0) ptr = log_config_info(ptr, flags);
 
   va_start(ap, format);
   if ((flags & LOG_CONFIG) != 0) ptr = log_config_info(ptr, flags);
 
   va_start(ap, format);


@@ -903,22 +902,17 @@ if (!write_rejectlog) flags &= ~LOG_REJECT;
 when called by a utility. */
 
 ptr = log_buffer;
 when called by a utility. */
 
 ptr = log_buffer;

-sprintf(CS ptr, "%s ", tod_stamp(tod_log));
-while(*ptr) ptr++;
+ptr += sprintf(CS ptr, "%s ", tod_stamp(tod_log));

 
 if (LOGGING(pid))
   {
 
 if (LOGGING(pid))
   {

-  sprintf(CS ptr, "[%d] ", (int)getpid());

   if (!syslog_pid) pid_position[0] = ptr - log_buffer; /* remember begin … */
   if (!syslog_pid) pid_position[0] = ptr - log_buffer; /* remember begin … */

-  while (*ptr) ptr++;
+  ptr += sprintf(CS ptr, "[%d] ", (int)getpid());

   if (!syslog_pid) pid_position[1] = ptr - log_buffer; /*  … and end+1 of the PID */
   }
 
 if (really_exim && message_id[0] != 0)
   if (!syslog_pid) pid_position[1] = ptr - log_buffer; /*  … and end+1 of the PID */
   }
 
 if (really_exim && message_id[0] != 0)

-  {
-  sprintf(CS ptr, "%s ", message_id);
-  while(*ptr) ptr++;
-  }
+  ptr += sprintf(CS ptr, "%s ", message_id);

 
 if ((flags & LOG_CONFIG) != 0) ptr = log_config_info(ptr, flags);
 
 
 if ((flags & LOG_CONFIG) != 0) ptr = log_config_info(ptr, flags);
 


@@ -933,10 +927,7 @@ this way because it kind of fits with LOG_RECIPIENTS. */
 
 if ((flags & LOG_SENDER) != 0 &&
     ptr < log_buffer + LOG_BUFFER_SIZE - 10 - Ustrlen(raw_sender))
 
 if ((flags & LOG_SENDER) != 0 &&
     ptr < log_buffer + LOG_BUFFER_SIZE - 10 - Ustrlen(raw_sender))

-  {
-  sprintf(CS ptr, " from <%s>", raw_sender);
-  while (*ptr) ptr++;
-  }
+  ptr += sprintf(CS ptr, " from <%s>", raw_sender);

 
 /* Add list of recipients to the message if required; the raw list,
 before rewriting, was saved in raw_recipients. There may be none, if an ACL
 
 /* Add list of recipients to the message if required; the raw list,
 before rewriting, was saved in raw_recipients. There may be none, if an ACL


@@ -946,19 +937,16 @@ if ((flags & LOG_RECIPIENTS) != 0 && ptr < log_buffer + LOG_BUFFER_SIZE - 6 &&
      raw_recipients_count > 0)
   {
   int i;
      raw_recipients_count > 0)
   {
   int i;

-  sprintf(CS ptr, " for");
-  while (*ptr) ptr++;
+  ptr += sprintf(CS ptr, " for");

   for (i = 0; i < raw_recipients_count; i++)
     {
   for (i = 0; i < raw_recipients_count; i++)
     {

-    uschar *s = raw_recipients[i];
+    uschar * s = raw_recipients[i];

     if (log_buffer + LOG_BUFFER_SIZE - ptr < Ustrlen(s) + 3) break;
     if (log_buffer + LOG_BUFFER_SIZE - ptr < Ustrlen(s) + 3) break;

-    sprintf(CS ptr, " %s", s);
-    while (*ptr) ptr++;
+    ptr += sprintf(CS ptr, " %s", s);

     }
   }
 
     }
   }
 

-sprintf(CS  ptr, "\n");
-while(*ptr) ptr++;
+ptr += sprintf(CS  ptr, "\n");

 length = ptr - log_buffer;
 
 /* Handle loggable errors when running a utility, or when address testing.
 length = ptr - log_buffer;
 
 /* Handle loggable errors when running a utility, or when address testing.


@@ -975,7 +963,7 @@ if (!really_exim || log_testing_mode)
     else
       fprintf(log_stderr, "%s", CS log_buffer);
     }
     else
       fprintf(log_stderr, "%s", CS log_buffer);
     }

-  if ((flags & LOG_PANIC_DIE) == LOG_PANIC_DIE) exim_exit(EXIT_FAILURE);
+  if ((flags & LOG_PANIC_DIE) == LOG_PANIC_DIE) exim_exit(EXIT_FAILURE, US"");

   return;
   }
 
   return;
   }
 


@@ -1000,7 +988,7 @@ if (  flags & LOG_MAIN
     operation. This happens at midnight, at which point we want to roll over
     the file. Closing it has the desired effect. */
 
     operation. This happens at midnight, at which point we want to roll over
     the file. Closing it has the desired effect. */
 

-    if (mainlog_datestamp != NULL)
+    if (mainlog_datestamp)

       {
       uschar *nowstamp = tod_stamp(string_datestamp_type);
       if (Ustrncmp (mainlog_datestamp, nowstamp, Ustrlen(nowstamp)) != 0)
       {
       uschar *nowstamp = tod_stamp(string_datestamp_type);
       if (Ustrncmp (mainlog_datestamp, nowstamp, Ustrlen(nowstamp)) != 0)


@@ -1084,11 +1072,9 @@ if ((flags & LOG_REJECT) != 0)
 
     /* A header with a NULL text is an unfilled in Received: header */
 
 
     /* A header with a NULL text is an unfilled in Received: header */
 

-    for (h = header_list; h != NULL; h = h->next)
+    for (h = header_list; h; h = h->next) if (h->text)

       {
       {

-      BOOL fitted;
-      if (h->text == NULL) continue;
-      fitted = string_format(ptr, LOG_BUFFER_SIZE - (ptr-log_buffer),
+      BOOL fitted = string_format(ptr, LOG_BUFFER_SIZE - (ptr-log_buffer),

         "%c %s", h->type, h->text);
       while(*ptr) ptr++;
       if (!fitted)         /* Buffer is full; truncate */
         "%c %s", h->type, h->text);
       while(*ptr) ptr++;
       if (!fitted)         /* Buffer is full; truncate */


@@ -1118,7 +1104,7 @@ if ((flags & LOG_REJECT) != 0)
     {
     struct stat statbuf;
 
     {
     struct stat statbuf;
 

-    if (rejectlog_datestamp != NULL)
+    if (rejectlog_datestamp)

       {
       uschar *nowstamp = tod_stamp(string_datestamp_type);
       if (Ustrncmp (rejectlog_datestamp, nowstamp, Ustrlen(nowstamp)) != 0)
       {
       uschar *nowstamp = tod_stamp(string_datestamp_type);
       if (Ustrncmp (rejectlog_datestamp, nowstamp, Ustrlen(nowstamp)) != 0)


@@ -1175,9 +1161,7 @@ if ((flags & LOG_PANIC) != 0)
     fprintf(log_stderr, "%s", CS log_buffer);
 
   if ((logging_mode & LOG_MODE_SYSLOG) != 0)
     fprintf(log_stderr, "%s", CS log_buffer);
 
   if ((logging_mode & LOG_MODE_SYSLOG) != 0)

-    {

     write_syslog(LOG_ALERT, log_buffer);
     write_syslog(LOG_ALERT, log_buffer);

-    }

 
   /* If this panic logging was caused by a failure to open the main log,
   the original log line is in panic_save_buffer. Make an attempt to write it. */
 
   /* If this panic logging was caused by a failure to open the main log,
   the original log line is in panic_save_buffer. Make an attempt to write it. */