Fix exigrep for "Completed" lines that have additional data (as a result

of +queue_time_overall).

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index a2c70635975a3680ae5ddd6d4ef9b08a93c8ed5b..4cc306291d8f63d60be5f81b49dbe0c24dfda220 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.50 2004/12/21 11:12:13 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.51 2004/12/21 11:28:38 ph10 Exp $

 
 Change log file for Exim from version 4.21
 -------------------------------------------
 
 Change log file for Exim from version 4.21
 -------------------------------------------


@@ -218,6 +218,11 @@ Exim version 4.50
     have made the code more robust (and fixed the comments that describe what
     is going on).
 
     have made the code more robust (and fixed the comments that describe what
     is going on).
 

+53. Now that there can be additional text after "Completed" in log lines (if
+    the queue_time_overall log selector is set), a one-byte patch to exigrep
+    was needed to allow it to recognize "Completed" as not the last thing in
+    the line.
+

 
 Exim version 4.43
 -----------------
 
 Exim version 4.43
 -----------------

diff --git a/src/src/exigrep.src b/src/src/exigrep.src
index bcd35973592ce26c3528dbb701e0fc9b1acb7cb7..e824bb41ca1e7e51d7d985dc8ea1c13050e9ee5a 100644 (file)
--- a/src/src/exigrep.src
+++ b/src/src/exigrep.src
@@ -1,5 +1,5 @@
 #! PERL_COMMAND -w
 #! PERL_COMMAND -w

-# $Cambridge: exim/src/src/exigrep.src,v 1.1 2004/10/07 10:39:01 ph10 Exp $
+# $Cambridge: exim/src/src/exigrep.src,v 1.2 2004/12/21 11:28:38 ph10 Exp $

 
 use strict;
 
 
 use strict;
 


@@ -81,7 +81,7 @@ if (my($id) = $entry =~ /^(\w{6}\-\w{6}\-\w{2})/)
   # print it, but in any event, throw away what was saved.
 
   if ($entry =~
   # print it, but in any event, throw away what was saved.
 
   if ($entry =~

-        /(?:Completed$|rejected (?:by local_scan|by non-SMTP ACL|after DATA))/)
+        /(?:Completed|rejected (?:by local_scan|by non-SMTP ACL|after DATA))/)

     {
     if ($saved{$id} =~ /^(\d{4}-\d\d-\d\d \d\d:\d\d:\d\d ([+-]\d{4} )?)(\w{6}\-\w{6}\-\w{2})/)
       {
     {
     if ($saved{$id} =~ /^(\d{4}-\d\d-\d\d \d\d:\d\d:\d\d ([+-]\d{4} )?)(\w{6}\-\w{6}\-\w{2})/)
       {