X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/7cd1141be4e551e80514c38662ec6e8209608205..2081aac24b67f3f3f34389aadc06354abcad0cad:/src/exim_monitor/em_main.c?ds=sidebyside diff --git a/src/exim_monitor/em_main.c b/src/exim_monitor/em_main.c index b3b27a24f..0a89fbb38 100644 --- 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.3 2005/08/09 13:31:52 ph10 Exp $ */ - /************************************************* * Exim Monitor * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2005 */ +/* Copyright (c) University of Cambridge 1995 - 2018 */ /* See the file NOTICE for conditions of use and distribution. */ @@ -168,15 +166,13 @@ 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); vfprintf(stderr, format, ap); fprintf(stderr, "\n"); va_end(ap); -selector = selector; /* Keep picky compilers happy */ -flags = flags; } @@ -242,9 +238,6 @@ if (action_queue_update) tick_queue_accumulator = 999999; void updateAction(Widget w, XtPointer client_data, XtPointer call_data) { -w = w; /* Keep picky compilers happy */ -client_data = client_data; -call_data = call_data; scan_spool_input(TRUE); queue_display(); tick_queue_accumulator = 0; @@ -252,9 +245,6 @@ tick_queue_accumulator = 0; void hideAction(Widget w, XtPointer client_data, XtPointer call_data) { -w = w; /* Keep picky compilers happy */ -client_data = client_data; -call_data = call_data; actioned_message[0] = 0; dialog_ref_widget = w; dialog_action = da_hide; @@ -265,11 +255,7 @@ void unhideAction(Widget w, XtPointer client_data, XtPointer call_data) { skip_item *sk = queue_skip; -w = w; /* Keep picky compilers happy */ -client_data = client_data; -call_data = call_data; - -while (sk != NULL) +while (sk) { skip_item *next = sk->next; store_free(sk); @@ -287,9 +273,6 @@ tick_queue_accumulator = 0; void quitAction(Widget w, XtPointer client_data, XtPointer call_data) { -w = w; /* Keep picky compilers happy */ -client_data = client_data; -call_data = call_data; exit(0); } @@ -320,10 +303,6 @@ Dimension width, height; XWindowAttributes a; Window w = XtWindow(toplevel_widget); -button = button; /* Keep picky compilers happy */ -client_data = client_data; -call_data = call_data; - /* Get the position and size of the top level widget. */ sizepos_args[0].value = (XtArgVal)(&width); @@ -475,9 +454,6 @@ tick_queue_accumulator += tick_interval; tick_stripchart_accumulator += tick_interval; read_log(); -pt = pt; /* Keep picky compilers happy */ -i = i; - /* If we have passed the queue update time, we must do a full scan of the queue, checking for new arrivals, etc. This will as a by-product set the count of items for use by the stripchart @@ -594,7 +570,8 @@ return ret; * Initialize * *************************************************/ -int main(int argc, char **argv) +int +main(int argc, char **argv) { int i; struct stat statdata; @@ -615,8 +592,8 @@ message_subdir[1] = 0; constructing file names and things. This call will initialize the store_get() function. */ -big_buffer_size = 1024; -big_buffer = store_get(big_buffer_size); +store_init(); +big_buffer = store_get(big_buffer_size, FALSE); /* Set up the version string and date and output them */ @@ -634,7 +611,7 @@ signal(SIGCHLD, sigchld_handler); /* Get the buffer for storing the string for the log display. */ -log_display_buffer = (uschar *)store_malloc(log_buffer_size); +log_display_buffer = US store_malloc(log_buffer_size); log_display_buffer[0] = 0; /* Initialize the data structures for the stripcharts */ @@ -645,8 +622,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,7 +633,9 @@ today.) */ if (log_file[0] != 0) { - (void)string_format(log_file_open, sizeof(log_file_open), CS log_file); + /* 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, NULL); log_datestamping = string_datestamp_offset >= 0; LOG = fopen(CS log_file_open, "r"); @@ -670,8 +649,14 @@ if (log_file[0] != 0) { fseek(LOG, 0, SEEK_END); log_position = ftell(LOG); - fstat(fileno(LOG), &statdata); - log_inode = statdata.st_ino; + if (fstat(fileno(LOG), &statdata)) + { + perror("log file fstat"); + fclose(LOG); + LOG=NULL; + } + else + log_inode = statdata.st_ino; } } else