git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TLS: PIPELINING under OpenSSL
[exim.git]
/
src
/
src
/
exiqgrep.src
diff --git
a/src/src/exiqgrep.src
b/src/src/exiqgrep.src
index e05589073142f823cd2b179cf06a14b2a545b3c0..d900e99337a49be8709277bae1eb0d203f34aa22 100644
(file)
--- a/
src/src/exiqgrep.src
+++ b/
src/src/exiqgrep.src
@@
-18,6
+18,7
@@
# Version 1.2
use strict;
# Version 1.2
use strict;
+BEGIN { pop @INC if $INC[-1] eq '.' };
use Getopt::Std;
# Have this variable point to your exim binary.
use Getopt::Std;
# Have this variable point to your exim binary.
@@
-43,8
+44,11
@@
if ($^O eq 'darwin') { # aka MacOS X
$base = 62;
};
$base = 62;
};
-getopts('hf:r:y:o:s:zxlibRc',\%opt);
+getopts('hf:r:y:o:s:C:zxlibRca',\%opt);
+if ($ARGV[0]) { &help; exit;}
if ($opt{h}) { &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}; }
# Read message queue output into hash
&collect();
# Read message queue output into hash
&collect();
@@
-60,6
+64,7
@@
sub help() {
Exim message queue display utility.
-h This help message.
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)
Selection criteria:
-f <regexp> Match sender address sender (field is "< >" wrapped)
@@
-78,11
+83,12
@@
Display options:
-i Message IDs only
-b Brief Format
-R Reverse order
-i Message IDs only
-b Brief Format
-R Reverse order
+ -a All recipients (including delivered)
EOF
}
sub collect() {
EOF
}
sub collect() {
- open(QUEUE,"$exim $eargs |") or die("Error open
n
ing pipe: $!\n");
+ open(QUEUE,"$exim $eargs |") or die("Error opening pipe: $!\n");
while(<QUEUE>) {
chomp();
my $line = $_;
while(<QUEUE>) {
chomp();
my $line = $_;