exigrep: do case sensitive option processing again. Closes 2392

-M (--related) was hidden by -m (--man), because of case insensitive
option matching. (4.90 … 4.92 did case insensitive option processing)

Thanks to Andreas Metzler for reporting this issue.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 01ee17960c51660bdad82697bdfa082532abcaa2..cf8c41a9f62f537867090168de9c02ae431c4ecd 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -70,6 +70,13 @@ HS/01 Bug 2390: Use message_id for tempfile creation to avoid races in a
       systems which restrict the file name length to lower values.
       (It was "hdr.$pid".)
 
       systems which restrict the file name length to lower values.
       (It was "hdr.$pid".)
 

+HS/01 Bug 2390: Use message_id for tempfile creation to avoid races in a
+      shared (NFS) environment.
+
+HS/02 Bug 2392: exigrep does case sensitive *option* processing (as it
+      did for all versions <4.90). Notably -M, -m, --invert, -I may be
+      affected.
+

 
 Exim version 4.92
 -----------------
 
 Exim version 4.92
 -----------------

diff --git a/src/src/exigrep.src b/src/src/exigrep.src
index 5db01fe082e8303356dd9789c125ac4498a7981d..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.


@@ -354,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>