fix non-bw case, late slip not re-run by my earlier tests

[exim.git] / src / exim_monitor / em_main.c

diff --git a/src/exim_monitor/em_main.c b/src/exim_monitor/em_main.c
index f86494aeb040b9814aaeae425d9cf3f466c16b5b..a0b94b168f9e730ba96c9019411eac1128141b32 100644 (file)
--- a/src/exim_monitor/em_main.c
+++ b/src/exim_monitor/em_main.c
@@ -1,10 +1,8 @@
-/* $Cambridge: exim/src/exim_monitor/em_main.c,v 1.4 2006/02/07 11:18:59 ph10 Exp $ */
-
 /*************************************************
 *                  Exim Monitor                  *
 *************************************************/
 
-/* Copyright (c) University of Cambridge 1995 - 2006 */
+/* Copyright (c) University of Cambridge 1995 - 2009 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
@@ -168,7 +166,7 @@ Returns:    nothing
 */
 
 void
-log_write(unsigned int selector, int flags, char *format, ...)
+log_write(unsigned int selector, int flags, const char *format, ...)
 {
 va_list ap;
 va_start(ap, format);
@@ -645,8 +643,8 @@ stripchart_init();
 only, and we can't tail the log. If not, open the log file and position to the
 end of it. Before doing so, we have to detect whether the log files are
 datestamped, and if so, sort out the name. The string in log_file already has
-%s replaced by "main"; if datestamping is occurring, %D will be present. In
-fact, we don't need to test explicitly - just process the string with
+%s replaced by "main"; if datestamping is occurring, %D or %M will be present.
+In fact, we don't need to test explicitly - just process the string with
 string_format.
 
 Once opened, save the file's inode so that we can detect when the file is
@@ -656,6 +654,8 @@ today.) */
 
 if (log_file[0] != 0)
   {
+  /* Do *not* use "%s" here, we need the %D datestamp in the log_file to
+  be expanded! */
   (void)string_format(log_file_open, sizeof(log_file_open), CS log_file);
   log_datestamping = string_datestamp_offset >= 0;