From 209e806ce1bf13554bf7a5cfe161b83f0fbbab3a Mon Sep 17 00:00:00 2001
From: mg <mg@fork.pl>
Date: Tue, 22 Apr 2014 00:41:34 +0200
Subject: [PATCH] exiqgrep: add -a to use all recipients (including delivered)

---
 doc/doc-docbook/spec.xfpt | 13 ++++++++++---
 src/src/exiqgrep.src      |  4 +++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 68ebf8ad6..3542557c4 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -34656,9 +34656,13 @@ This utility is a Perl script contributed by Matt Hubbard. It runs
 .code
 exim -bpu
 .endd
-to obtain a queue listing with undelivered recipients only, and then greps the
-output to select messages that match given criteria. The following selection
-options are available:
+or (in case &*-a*& switch is specified)
+.code
+exim -bp
+.endd 
+
+to obtain a queue listing, and then greps the output to select messages 
+that match given criteria. The following selection options are available:
 
 .vlist
 .vitem &*-f*&&~<&'regex'&>
@@ -34705,6 +34709,9 @@ Brief format &-- one line per message.
 
 .vitem &*-R*&
 Display messages in reverse order.
+
+.vitem &*-a*&
+Include delivered recipients in queue listing.
 .endlist
 
 There is one more option, &%-h%&, which outputs a list of options.
diff --git a/src/src/exiqgrep.src b/src/src/exiqgrep.src
index e05589073..05c1b9ed0 100644
--- a/src/src/exiqgrep.src
+++ b/src/src/exiqgrep.src
@@ -43,8 +43,9 @@ if ($^O eq 'darwin') { # aka MacOS X
   $base = 62;
 };
 
-getopts('hf:r:y:o:s:zxlibRc',\%opt);
+getopts('hf:r:y:o:s:zxlibRca',\%opt);
 if ($opt{h}) { &help; exit;}
+if ($opt{a}) { $eargs = '-bp'; }
 
 # Read message queue output into hash
 &collect();
@@ -78,6 +79,7 @@ Display options:
 	-i		Message IDs only
 	-b		Brief Format
 	-R		Reverse order
+	-a		All recipients (including delivered)
 EOF
 }
 
-- 
2.25.1