X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/079cc20f36c728c7090dd9c70cc415c5f5dabacd..261dc43e32f6039781ca92535e56f5caaa68b809:/src/src/exiwhat.src

diff --git a/src/src/exiwhat.src b/src/src/exiwhat.src
index 4905aa44c..5f8150786 100644
--- a/src/src/exiwhat.src
+++ b/src/src/exiwhat.src
@@ -1,7 +1,7 @@
 #! /bin/sh
-# $Cambridge: exim/src/src/exiwhat.src,v 1.2 2008/04/21 13:13:57 fanf2 Exp $
+# $Cambridge: exim/src/src/exiwhat.src,v 1.5 2009/11/16 19:50:36 nm4 Exp $
 
-# Copyright (c) 2003 University of Cambridge.
+# Copyright (c) University of Cambridge, 1995 - 2007
 # See the file NOTICE for conditions of use and distribution.
 
 # Except when they appear in comments, the following placeholders in this
@@ -75,6 +75,12 @@ while [ "$config" = "" -a $# -gt 0 ] ; do
   shift
 done
 
+# check we have a config file
+if [ "$config" = "" -o ! -f "$config" ]; then
+  echo Config file not found.
+  exit 1
+fi
+
 # Determine where the spool directory is. Search for an exim_path setting
 # in the configure file; otherwise use the bin directory. Call that version of
 # Exim to find the spool directory. BEWARE: a tab character is needed in the
@@ -124,7 +130,7 @@ fi
 sleep 1
 
 if [ ! -s ${log} ] ; then echo "No exim process data" ;
-  else sed 's/^[0-9-]* [0-9:]* \([+-][0-9]* \)*//' ${log} | sort -n | uniq ; fi
+  else sed 's/^[0-9-]* [0-9:]* \([+-][0-9]* \)*\(\[[0-9]\+\] \)\?//' ${log} | sort -n | uniq ; fi
 
 
 # End of exiwhat