X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/bd4c97599a4d321677cdf677275022f6660930f9..1ed70f64c0df2c1428057c2ad5b3d43260087396:/src/src/exiqgrep.src

diff --git a/src/src/exiqgrep.src b/src/src/exiqgrep.src
index fd8b5a6c3..9dfa2c735 100644
--- a/src/src/exiqgrep.src
+++ b/src/src/exiqgrep.src
@@ -1,8 +1,9 @@
 #!PERL_COMMAND
-# $Cambridge: exim/src/src/exiqgrep.src,v 1.1 2004/10/07 10:39:01 ph10 Exp $
 
 # Utility for searching and displaying queue information.
 # Written by Matt Hubbard 15 August 2002
+#
+# Copyright (c) The Exim Maintainers 2021
 
 # Except when they appear in comments, the following placeholders in this
 # source are replaced when it is turned into a runnable script:
@@ -16,10 +17,13 @@
 # Routine for extracting the UTC timestamp from message ID
 # lifted from eximstat utility
 
-# Version 1.1
+# 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';
@@ -44,8 +48,21 @@ if ($^O eq 'darwin') { # aka MacOS X
   $base = 62;
 };
 
-getopts('hf:r:y:o:s:zxlibRc',\%opt);
-if ($opt{h}) { &help; exit;}
+if ($ARGV[0] eq '--version') {
+    print basename($0) . ": $0\n",
+        "build: EXIM_RELEASE_VERSIONEXIM_VARIANT_VERSION\n",
+        "perl(runtime): $]\n";
+        exit 0;
+}
+
+if (!getopts('hf:r:y:o:s:C:zxlibRcaG:E:',\%opt)) { &help; exit; }
+if ($opt{h}) { &help; exit; }
+if ($ARGV[0] || !($opt{f} || $opt{r} || $opt{s} || $opt{y} || $opt{o} || $opt{z} || $opt{x} || $opt{c}))
+   { &help; exit(1); }
+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}; }
+if ($opt{E}) { $exim = $opt{E}; }
 
 # Read message queue output into hash
 &collect();
@@ -61,6 +78,8 @@ sub help() {
 Exim message queue display utility.
 
 	-h		This help message.
+	-C		Specify which exim.conf to use.
+	-E		Specify exim binary to use.
 
 Selection criteria:
 	-f <regexp>	Match sender address sender (field is "< >" wrapped)
@@ -70,6 +89,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>/ ]
 
@@ -79,16 +99,17 @@ 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 = $_;
 		#Should be 1st line of record, if not error.
-		if ($line =~ /^\s*(\w+)\s+((?:\d+(?:\.\d+)?[A-Z])?)\s*(\w{6}-\w{6}-\w{2})\s+(<.*?>)/) {
+		if ($line =~ /^\s*(\w+)\s+((?:\d+(?:\.\d+)?[A-Z]?)?)\s*(\w{6}-\w{6}-\w{2})\s+(<.*?>)/) {
 			my $msg = $3;
 			$id{$msg}{age} = $1;
 			$id{$msg}{size} = $2;
@@ -116,13 +137,13 @@ sub selection() {
 	foreach my $msg (keys(%id)) {
 		if ($opt{f}) {
 			# Match sender address
-			next unless ($id{$msg}{from} =~ /$opt{f}/);
+			next unless ($id{$msg}{from} =~ /$opt{f}/i);
 		}
 		if ($opt{r}) {
 			# Match any recipient address
 			my $match = 0;
 			foreach my $rcpt (@{$id{$msg}{rcpt}}) {
-				$match++ if ($rcpt =~ /$opt{r}/);
+				$match++ if ($rcpt =~ /$opt{r}/i);
 			}
 			next unless ($match);
 		}