git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Setting LC_ALL with make overrode this sort check
[exim.git]
/
src
/
exim_monitor
/
em_log.c
diff --git
a/src/exim_monitor/em_log.c
b/src/exim_monitor/em_log.c
index 409f2daf6c2e8a28b3e88a053fb81479e1c96a39..0441edd2eb84f0a7d61d158d46658fc7cc77149f 100644
(file)
--- a/
src/exim_monitor/em_log.c
+++ b/
src/exim_monitor/em_log.c
@@
-1,10
+1,8
@@
-/* $Cambridge: exim/src/exim_monitor/em_log.c,v 1.5 2007/01/31 16:52:12 ph10 Exp $ */
-
/*************************************************
* Exim Monitor *
*************************************************/
/*************************************************
* Exim Monitor *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 20
07
*/
+/* Copyright (c) University of Cambridge 1995 - 20
12
*/
/* See the file NOTICE for conditions of use and distribution. */
/* This module contains code for scanning the main log,
/* See the file NOTICE for conditions of use and distribution. */
/* This module contains code for scanning the main log,
@@
-58,6
+56,8
@@
static int scrolled = FALSE;
static int size = 0;
static int top = 0;
static int size = 0;
static int top = 0;
+static void show_log(char *s, ...) PRINTF_FUNCTION(1,2);
+
static void show_log(char *s, ...)
{
int length, newtop;
static void show_log(char *s, ...)
{
int length, newtop;
@@
-364,6
+364,8
@@
link count of zero on the currently open file. */
if (log_datestamping)
{
uschar log_file_wanted[256];
if (log_datestamping)
{
uschar log_file_wanted[256];
+ /* Do *not* use "%s" here, we need the %D datestamp in the log_file to
+ * be expanded! */
string_format(log_file_wanted, sizeof(log_file_wanted), CS log_file);
if (Ustrcmp(log_file_wanted, log_file_open) != 0)
{
string_format(log_file_wanted, sizeof(log_file_wanted), CS log_file);
if (Ustrcmp(log_file_wanted, log_file_open) != 0)
{