exim_msgdate: more options, better perl version compatibility

[exim.git] / src / src / exiwhat.src

diff --git a/src/src/exiwhat.src b/src/src/exiwhat.src
index 77d7f16b96cde4bb80432f8cf56a114c2b2633c0..a1f748edd570ed75df0955448adcfca2e001adc5 100644 (file)
--- a/src/src/exiwhat.src
+++ b/src/src/exiwhat.src
@@ -1,7 +1,6 @@
 #! /bin/sh
 #! /bin/sh

-# $Cambridge: exim/src/src/exiwhat.src,v 1.1 2004/10/07 10:39:01 ph10 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
 # See the file NOTICE for conditions of use and distribution.
 
 # Except when they appear in comments, the following placeholders in this


@@ -16,6 +15,7 @@
 # EXIWHAT_EGREP_ARG
 # EXIWHAT_MULTIKILL_CMD
 # EXIWHAT_MULTIKILL_ARG
 # EXIWHAT_EGREP_ARG
 # EXIWHAT_MULTIKILL_CMD
 # EXIWHAT_MULTIKILL_ARG

+# RM_COMMAND

 
 # PROCESSED_FLAG
 
 
 # PROCESSED_FLAG
 


@@ -30,6 +30,8 @@
 # the script in the next Exim rebuild/install. However, it's best to
 # arrange your build-time configuration file to get the correct values.
 
 # the script in the next Exim rebuild/install. However, it's best to
 # arrange your build-time configuration file to get the correct values.
 

+rm=RM_COMMAND
+

 # Some operating systems have a command that finds processes that match
 # certain conditions (by default usually those running specific commands)
 # and sends them signals. If such a command is defined for your OS, the
 # Some operating systems have a command that finds processes that match
 # certain conditions (by default usually those running specific commands)
 # and sends them signals. If such a command is defined for your OS, the


@@ -53,6 +55,13 @@ signal=EXIWHAT_KILL_SIGNAL
 # See if this installation is using the esoteric "USE_NODE" feature of Exim,
 # in which it uses the host's name as a suffix for the configuration file name.
 
 # See if this installation is using the esoteric "USE_NODE" feature of Exim,
 # in which it uses the host's name as a suffix for the configuration file name.
 

+if test "x$1" = x--version
+then
+    echo "`basename $0`: $0"
+    echo "build: EXIM_RELEASE_VERSIONEXIM_VARIANT_VERSION"
+    exit 0
+fi
+

 if [ "CONFIGURE_FILE_USE_NODE" = "yes" ]; then
   hostsuffix=.`uname -n`
 fi
 if [ "CONFIGURE_FILE_USE_NODE" = "yes" ]; then
   hostsuffix=.`uname -n`
 fi


@@ -75,6 +84,12 @@ while [ "$config" = "" -a $# -gt 0 ] ; do
   shift
 done
 
   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
 # 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


@@ -98,7 +113,7 @@ fi
 
 # Now do the job.
 
 
 # Now do the job.
 

-/bin/rm -f ${log}
+$rm -f ${log}

 if [ -f ${log} ]; then
   echo "** Failed to remove ${log}"
   exit 1
 if [ -f ${log} ]; then
   echo "** Failed to remove ${log}"
   exit 1


@@ -109,7 +124,7 @@ fi
 # Solaris, "killall" kills ALL processes - this is the System V version of this
 # command, and not what we want!
 
 # Solaris, "killall" kills ALL processes - this is the System V version of this
 # command, and not what we want!
 

-if [ "$multikill_cmd" != "" ] ; then
+if [ "$multikill_cmd" != "" ] && type "$multikill_cmd" >/dev/null 2>&1; then

   $multikill_cmd $signal "$multikill_arg"
 
 # No multikill command; do it the hard way
   $multikill_cmd $signal "$multikill_arg"
 
 # No multikill command; do it the hard way


@@ -124,7 +139,7 @@ fi
 sleep 1
 
 if [ ! -s ${log} ] ; then echo "No exim process data" ;
 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 sort -nu ${log} ; fi

 
 
 # End of exiwhat
 
 
 # End of exiwhat