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
GnuTLS: lose DH-param setup, for recent library versions where no longer needed
[exim.git]
/
src
/
src
/
exigrep.src
diff --git
a/src/src/exigrep.src
b/src/src/exigrep.src
index 118cd91b91d41c00fd21c76e99fb53b6458415b3..afd3538b69b4e55eddbd1f2fc391eaa3be325073 100644
(file)
--- a/
src/src/exigrep.src
+++ b/
src/src/exigrep.src
@@
-5,7
+5,7
@@
use strict;
BEGIN { pop @INC if $INC[-1] eq '.' };
use Pod::Usage;
BEGIN { pop @INC if $INC[-1] eq '.' };
use Pod::Usage;
-use Getopt::Long;
+use Getopt::Long
qw(:config no_ignore_case)
;
use File::Basename;
# Copyright (c) 2007-2017 University of Cambridge.
use File::Basename;
# Copyright (c) 2007-2017 University of Cambridge.
@@
-233,7
+233,7
@@
GetOptions(
'version' => sub {
print basename($0) . ": $0\n",
"build: EXIM_RELEASE_VERSIONEXIM_VARIANT_VERSION\n",
'version' => sub {
print basename($0) . ": $0\n",
"build: EXIM_RELEASE_VERSIONEXIM_VARIANT_VERSION\n",
- "perl(runtime): $
^V
\n";
+ "perl(runtime): $
]
\n";
exit 0;
},
) and @ARGV or pod2usage;
exit 0;
},
) and @ARGV or pod2usage;
@@
-244,7
+244,8
@@
$pattern = quotemeta $pattern if $literal;
# Start a pager if output goes to a terminal
if (-t 1 and $use_pager)
{
# Start a pager if output goes to a terminal
if (-t 1 and $use_pager)
{
- foreach ($ENV{PAGER}//(), 'less', 'more')
+ # for perl >= v5.10.x: foreach ($ENV{PAGER}//(), 'less', 'more')
+ foreach (defined $ENV{PAGER} ? $ENV{PAGER} : (), 'less', 'more')
{
local $ENV{LESS} .= ' --no-init --quit-if-one-screen';
open(my $pager, '|-', $_) or next;
{
local $ENV{LESS} .= ' --no-init --quit-if-one-screen';
open(my $pager, '|-', $_) or next;
@@
-353,7
+354,7
@@
Do not use a pager, even if STDOUT is connected to a terminal.
=item B<-h>|B<--help>
Print a short reference help. For more detailed help try L<exigrep(8)>,
=item B<-h>|B<--help>
Print a short reference help. For more detailed help try L<exigrep(8)>,
-or C<exigrep -
m
>.
+or C<exigrep -
-man
>.
=item B<-m>|B<--man>
=item B<-m>|B<--man>