From efa7b0a210e1baa8e128fc98c5443a944c39ad24 Mon Sep 17 00:00:00 2001 From: Lasse Collin Date: Thu, 9 Oct 2014 18:42:14 +0300 Subject: 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. --- src/scripts/xzgrep.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/scripts/xzgrep.in b/src/scripts/xzgrep.in index 018915f7..a1fd19cf 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) -- cgit v1.2.3