From b2335c0b21d064f660e593112f8c349e48414c9f Mon Sep 17 00:00:00 2001
From: Nigel Metheringham <nigel@exim.org>
Date: Mon, 19 Oct 2009 11:47:43 +0000
Subject: [PATCH] Correct exiwhat mishandling log_selector = +pid.  Fixes: #688

---
 doc/doc-txt/ChangeLog | 5 ++++-
 src/src/exiwhat.src   | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index ddf4f5542..295e91723 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.574 2009/10/19 11:41:27 nm4 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.575 2009/10/19 11:47:43 nm4 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -120,6 +120,9 @@ NM/22 Bugzilla 607: prepend (not append) Resent-Message-ID and Resent-Date
 NM/23 Bugzilla 687: Fix misparses in eximstats
       Patch provided by Heiko Schlittermann
 
+NM/24 Bugzilla 688: Fix exiwhat to handle log_selector = +pid
+      Patch provided by Heiko Schlittermann
+
 
 Exim version 4.69
 -----------------
diff --git a/src/src/exiwhat.src b/src/src/exiwhat.src
index c5bb312bb..3af128cf4 100644
--- a/src/src/exiwhat.src
+++ b/src/src/exiwhat.src
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Cambridge: exim/src/src/exiwhat.src,v 1.3 2009/01/02 16:58:05 nm4 Exp $
+# $Cambridge: exim/src/src/exiwhat.src,v 1.4 2009/10/19 11:47:44 nm4 Exp $
 
 # Copyright (c) 2003 University of Cambridge.
 # See the file NOTICE for conditions of use and distribution.
@@ -130,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
-- 
2.25.1