[exim-cvs] Fix exiqgrep issue where malformed lines not pars…

Commit:     bd4c97599a4d321677cdf677275022f6660930f9
Parent:     b32a971138c1120763af565a142787cf3175ced7
Author:     Nigel Metheringham <nigel@???>
AuthorDate: Sun Feb 6 19:20:06 2011 +0000
Committer:  Nigel Metheringham <nigel@???>
CommitDate: Sun Feb 6 19:20:06 2011 +0000

    Fix exiqgrep issue where malformed lines not parsed

    Fixes bug 943
    Lightly tested, but not with report error condition,
    would like reporter to check this fix on their system.
---
 doc/doc-txt/ChangeLog |    3 +++
 src/src/exiqgrep.src  |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 083870a..135213b 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -35,6 +35,9 @@ NM/03 Allow underscore in dnslist lookups
 PP/04 Bugzilla 230: Support TLS-enabled LDAP (in addition to ldaps).
       Code patches from Adam Ciarcinski of NetBSD.

+NM/04 Fixed exiqgrep to cope with mailq missing size issue
+      Fixes bug 943.
+

 Exim version 4.74
 -----------------
diff --git a/src/src/exiqgrep.src b/src/src/exiqgrep.src
index 9abaab7..fd8b5a6 100644
--- a/src/src/exiqgrep.src
+++ b/src/src/exiqgrep.src
@@ -88,7 +88,7 @@ sub collect() {
         chomp();
         my $line = $_;
         #Should be 1st line of record, if not error.
-        if ($line =~ /^\s*(\w+)\s+(\S+)\s+(\w{6}-\w{6}-\w{2})\s+(<.*?>)/) {
+        if ($line =~ /^\s*(\w+)\s+((?:\d+(?:\.\d+)?[A-Z])?)\s*(\w{6}-\w{6}-\w{2})\s+(<.*?>)/) {
             my $msg = $3;
             $id{$msg}{age} = $1;
             $id{$msg}{size} = $2;