From 27607d0311c4b32440c6a3396e4a022640dd930e Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Fri, 10 May 2019 13:02:28 +0100
Subject: [PATCH] Utilities: add -G<queuename> option to exiqgrep.  Bug 2397

---
 doc/doc-docbook/spec.xfpt | 5 +++++
 src/src/exiqgrep.src      | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index dea7bc761..e2f1eafe1 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -37720,6 +37720,11 @@ Match only frozen messages.
 
 .vitem &*-x*&
 Match only non-frozen messages.
+
+.new
+.vitem &*-G*&&~<&'queuename'&>
+Match only messages in the given queue.  Without this, the default queue is searched.
+.wen
 .endlist
 
 The following options control the format of the output:
diff --git a/src/src/exiqgrep.src b/src/src/exiqgrep.src
index c4f7c4b58..c8762df47 100644
--- a/src/src/exiqgrep.src
+++ b/src/src/exiqgrep.src
@@ -53,11 +53,12 @@ if ($ARGV[0] eq '--version') {
         exit 0;
 }
 
-getopts('hf:r:y:o:s:C:zxlibRca',\%opt);
+getopts('hf:r:y:o:s:C:zxlibRcaG:',\%opt);
 if ($ARGV[0]) { &help; exit;}
 if ($opt{h}) { &help; exit;}
 if ($opt{a}) { $eargs = '-bp'; }
 if ($opt{C} && -e $opt{C} && -f $opt{C} && -R $opt{C}) { $eargs .= ' -C '.$opt{C}; }
+if ($opt{G}) { $eargs .= ' -qG'.$opt{G}; }
 
 # Read message queue output into hash
 &collect();
@@ -83,6 +84,7 @@ Selection criteria:
 	-o <seconds>	Message older than
 	-z		Frozen messages only (exclude non-frozen)
 	-x		Non-frozen messages only (exclude frozen)
+	-G <queuename>	Match in given queue only
 
 [ NB: for regexps, provided string sits in /<string>/ ]
 
-- 
2.30.2