X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Fexiqgrep.src;h=c4f7c4b58aac30f11964b775b9429c6e7e5aea62;hb=3a9262974035b6b8efebffcdf50a2371f3636477;hp=afecbffeec250e8183f2eaed80cecf0957fa1fa5;hpb=3ae173e7c0fd026a06c8804d38fe2c03d161e402;p=exim.git

diff --git a/src/src/exiqgrep.src b/src/src/exiqgrep.src
index afecbffee..c4f7c4b58 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,7 +46,15 @@ if ($^O eq 'darwin') { # aka MacOS X
   $base = 62;
 };
 
+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:zxlibRca',\%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}; }
@@ -86,7 +97,7 @@ 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 = $_;