Utilities: add -G<queuename> option to exiqgrep. Bug 2397

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index dea7bc76180c9246b775668cb80bfbef991a9968..e2f1eafe1f3cda5cf3179bc9250cbed27d052c8f 100644 (file)
--- 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.
 
 .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:
 .endlist
 
 The following options control the format of the output:

diff --git a/src/src/exiqgrep.src b/src/src/exiqgrep.src
index c4f7c4b58aac30f11964b775b9429c6e7e5aea62..c8762df479da01279db8d73d9a4a1ad3a57ecd93 100644 (file)
--- a/src/src/exiqgrep.src
+++ b/src/src/exiqgrep.src
@@ -53,11 +53,12 @@ if ($ARGV[0] eq '--version') {
         exit 0;
 }
 
         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 ($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();
 
 # 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)
        -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>/ ]
 
 
 [ NB: for regexps, provided string sits in /<string>/ ]