aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2014-10-09 18:42:14 +0300
committerLasse Collin <lasse.collin@tukaani.org>2014-12-17 21:13:42 +0200
commitf229fa32bf70bf9b109864d216719371af108364 (patch)
treed32cd258b67f7fcc24f01c9192441ceb2819a916
parentBuild: Detect supported compiler warning flags better. (diff)
downloadxz-f229fa32bf70bf9b109864d216719371af108364.tar.xz
xzgrep: Avoid passing both -q and -l to grep.
The behavior of grep -ql varies: - GNU grep behaves like grep -q. - OpenBSD grep behaves like grep -l. POSIX doesn't make it 100 % clear what behavior is expected. Anyway, using both -q and -l at the same time makes no sense so both options simply should never be used at the same time. Thanks to Christian Weisgerber.
-rw-r--r--src/scripts/xzgrep.in6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/scripts/xzgrep.in b/src/scripts/xzgrep.in
index b927a559..3ecb7cf0 100644
--- a/src/scripts/xzgrep.in
+++ b/src/scripts/xzgrep.in
@@ -106,9 +106,11 @@ while test $# -ne 0; do
with_filename=1
continue;;
(-l | --files-with-*)
- files_with_matches=1;;
+ files_with_matches=1
+ continue;;
(-L | --files-witho*)
- files_without_matches=1;;
+ files_without_matches=1
+ continue;;
(-h | --no-f*)
no_filename=1;;
(-V | --v | --ve | --ver | --vers | --versi | --versio | --version)