git: 24c681a7f6d6 - main - grep: fix combination of quite and count flag

[Mariusz Zaborski]

The branch main has been updated by oshogbo:

URL: https://cgit.FreeBSD.org/src/commit/?id=24c681a7f6d6c777221fdbd289da64ff65ad8785

commit 24c681a7f6d6c777221fdbd289da64ff65ad8785
Author:     Mariusz Zaborski <oshogbo at FreeBSD.org>
AuthorDate: 2021-07-09 12:09:14 +0000
Commit:     Mariusz Zaborski <oshogbo at FreeBSD.org>
CommitDate: 2021-07-09 12:09:14 +0000

    grep: fix combination of quite and count flag
    
    When the quite (-q) flag is provided, we don't expect any output.
    Currently, the behavior is broken:
    $ grep -cq flag util.c
    1
    
    $ grep -cs flag util.c
    55
    
    First of all, we print a number to stdout. Secondly, it just returns
    0 or 1 (which is unexpected). GNU grep with c and q flags doesn't
    print anything.
    
    Reviewed by:    markj
    Differential Revision:  https://reviews.freebsd.org/D31108
---
 usr.bin/grep/util.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr.bin/grep/util.c b/usr.bin/grep/util.c
index a2520e24de8e..698e347c192e 100644
--- a/usr.bin/grep/util.c
+++ b/usr.bin/grep/util.c
@@ -388,7 +388,7 @@ procfile(const char *fn)
 		clearqueue();
 	grep_close(f);
 
-	if (cflag) {
+	if (cflag && !qflag) {
 		if (!hflag)
 			printf("%s:", pc.ln.file);
 		printf("%u\n", lines);