Utilities: fix exiqgrep perl syntax, add testcases. Bug 2821

[exim.git] / src / src / exiqgrep.src

diff --git a/src/src/exiqgrep.src b/src/src/exiqgrep.src
index 9fee423e421c69581d2eaaf4abc073b614273fe4..9dfa2c735d7ec7c293c764e4be6c7676ba71bba2 100644 (file)
--- a/src/src/exiqgrep.src
+++ b/src/src/exiqgrep.src
@@ -55,12 +55,14 @@ if ($ARGV[0] eq '--version') {
         exit 0;
 }
 
-if (!getopts('hf:r:y:o:s:C:zxlibRcaG:',\%opt) { &help; exit;}
-if ($ARGV[0]) { &help; exit;}
-if ($opt{h}) { &help; exit;}
+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();
@@ -77,6 +79,7 @@ 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)