X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Fexiqgrep.src;h=c8762df479da01279db8d73d9a4a1ad3a57ecd93;hb=a04174dc2a84ae1008c23b6a7109e7fa3fb7b8b0;hp=e05589073142f823cd2b179cf06a14b2a545b3c0;hpb=e41be3f6bf1f53f9e9f858320ad1ac62dc86930c;p=exim.git

diff --git a/src/src/exiqgrep.src b/src/src/exiqgrep.src
index e05589073..c8762df47 100644
--- a/src/src/exiqgrep.src
+++ b/src/src/exiqgrep.src
@@ -18,7 +18,10 @@
 # Version 1.2
 
 use strict;
+BEGIN { pop @INC if $INC[-1] eq '.' };
+
 use Getopt::Std;
+use File::Basename;
 
 # Have this variable point to your exim binary.
 my $exim = 'BIN_DIRECTORY/exim';
@@ -43,8 +46,19 @@ if ($^O eq 'darwin') { # aka MacOS X
   $base = 62;
 };
 
-getopts('hf:r:y:o:s:zxlibRc',\%opt);
+if ($ARGV[0] eq '--version') {
+    print basename($0) . ": $0\n",
+        "build: EXIM_RELEASE_VERSIONEXIM_VARIANT_VERSION\n",
+        "perl(runtime): $]\n";
+        exit 0;
+}
+
+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();
@@ -60,6 +74,7 @@ sub help() {
 Exim message queue display utility.
 
 	-h		This help message.
+	-C		Specify which exim.conf to use.
 
 Selection criteria:
 	-f <regexp>	Match sender address sender (field is "< >" wrapped)
@@ -69,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>/ ]
 
@@ -78,11 +94,12 @@ Display options:
 	-i		Message IDs only
 	-b		Brief Format
 	-R		Reverse order
+	-a		All recipients (including delivered)
 EOF
 }
 
 sub collect() {
-	open(QUEUE,"$exim $eargs |") or die("Error openning pipe: $!\n");
+	open(QUEUE,"$exim $eargs |") or die("Error opening pipe: $!\n");
 	while(<QUEUE>) {
 		chomp();
 		my $line = $_;