Merge branch 'master' into transp_logging_1031

[users/jgh/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 6de84662403609d20ee41d1bf87347090c056746..d210a07179dfd07ca38c5c33591d367337421037 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.1 2004/10/07 10:39:01 ph10 Exp $ */
-

 /*************************************************
 *                  Exim Monitor                  *
 *************************************************/
 
 /*************************************************
 *                  Exim Monitor                  *
 *************************************************/
 

-/* Copyright (c) University of Cambridge 1995 - 2004 */
+/* Copyright (c) University of Cambridge 1995 - 2012 */

 /* See the file NOTICE for conditions of use and distribution. */
 
 
 /* See the file NOTICE for conditions of use and distribution. */
 
 


@@ -168,7 +166,7 @@ Returns:    nothing
 */
 
 void
 */
 
 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);
 {
 va_list ap;
 va_start(ap, format);


@@ -200,7 +198,7 @@ Returns:     0 if there is no port, else the port number.
 */
 
 int
 */
 
 int

-host_extract_port(uschar *address)
+host_address_extract_port(uschar *address)

 {
 int skip = -3;                     /* Skip 3 dots in IPv4 addresses */
 address--;
 {
 int skip = -3;                     /* Skip 3 dots in IPv4 addresses */
 address--;


@@ -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
 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
 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)
   {
 
 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;
 
   (void)string_format(log_file_open, sizeof(log_file_open), CS log_file);
   log_datestamping = string_datestamp_offset >= 0;