Use "not accepted" rather than "not completed" for non-accepted messages

shown by exigrep.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 24632a2917edb851650cff7adf707a1eb3fc5a64..7f6590ec6e24f1f14d5f292eb8e1ca767bdc53d4 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.491 2007/03/13 11:06:48 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.492 2007/03/13 11:26:49 ph10 Exp $

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


@@ -156,6 +156,13 @@ PH/35 Applied a patch from the Sieve maintainer which fixes a bug in "notify".
 
 PH/36 Applied John Jetmore's patch to add -v functionality to exigrep.
 
 
 PH/36 Applied John Jetmore's patch to add -v functionality to exigrep.
 

+PH/37 If a message is not accepted after it has had an id assigned (e.g.
+      because it turns out to be too big or there is a timeout) there is no
+      "Completed" line in the log. When such a message was selected by exigrep,
+      it was listed as "not completed". Such messages can be identified by the
+      lack of a "<=" line in the log, and they are now listed as "not
+      accepted".
+

 
 Exim version 4.66
 -----------------
 
 Exim version 4.66
 -----------------

diff --git a/src/src/exigrep.src b/src/src/exigrep.src
index aa03eb4896ff8afb6305dc412904752842fd786b..6024b425f18a021cdd7485204f8e975bf5f8d274 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.7 2007/03/13 11:06:48 ph10 Exp $
+# $Cambridge: exim/src/src/exigrep.src,v 1.8 2007/03/13 11:26:49 ph10 Exp $

 
 use strict;
 
 
 use strict;
 


@@ -172,8 +172,16 @@ if (@ARGV)
 
 else { do_line() while (<STDIN>); }
 
 
 else { do_line() while (<STDIN>); }
 

-# At the end of processing all the input, print any uncompleted data
+# At the end of processing all the input, print any uncompleted messages. If
+# there is no <= line, we are dealing with a message that was rejected or
+# abandoned.

 
 

-for (keys %id_list) { print "+++ $_ not completed +++\n$saved{$_}\n"; }
+for (keys %id_list)
+  {
+  if ($saved{$_} =~ /\s<=\s/)
+    { print "+++ $_ has not completed +++\n$saved{$_}\n"; }
+  else
+    { print "+++ $_ was not accepted +++\n$saved{$_}\n"; }
+  }

 
 # End of exigrep
 
 # End of exigrep