Received: (at submit) by bugs.debian.org; 1 Nov 2000 05:59:08 +0000
From peter@cadcamlab.org Tue Oct 31 23:59:08 2000
Return-path: <peter@cadcamlab.org>
Received: from wire.cadcamlab.org [::ffff:156.26.20.181] 
	by master.debian.org with esmtp (Exim 3.12 1 (Debian))
	id 13qqvU-0002po-00; Tue, 31 Oct 2000 23:59:08 -0600
Received: from peter by wire.cadcamlab.org with local (Exim 3.16 #1 (Debian))
	id 13qqvT-0004im-00
	for <submit@bugs.debian.org>; Wed, 01 Nov 2000 05:59:07 +0000
From: Peter Samuelson <peter@cadcamlab.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Message-ID: <14847.45354.638266.208512@wire.cadcamlab.org>
Date: Tue, 31 Oct 2000 23:59:06 -0600 (CST)
To: submit@bugs.debian.org
Subject: grep: [PATCH] "grep -lc" should Do The Right Thing
X-Mailer: VM 6.75 under 21.1 (patch 12) "Channel Islands" XEmacs Lucid
X-Face: ?*2Jm8R'OlE|+C~V>u$CARJyKMOpJ"^kNhLusXnPTFBF!#8,jH/#=Iy(?ehN$jH
        }x;J6B@[z.Ad\Be5RfNB*1>Eh.'R%u2gRj)M4blT]vu%^Qq<t}^(BOmgzRrz$[5
        -%a(sjX_"!'1WmD:^$(;$Q8~qz\;5NYji]}f.H*tZ-u1}4kJzsa@id?4rIa3^4A$
Delivered-To: submit@bugs.debian.org


Package: grep
Version: 2.4.2-1
Severity: wishlist

Okay, grep has two very useful options, -l and -c:

  -l, --files-with-matches  only print FILE names containing matches
  -c, --count               only print a count of matching lines per FILE

It seems only logical that 'grep -lc' would count the matching lines
per file, but skip files with no matches.  Obvious, right? (: But the
status quo is that 'grep -lc' gives garbled output from both options,
i.e. "undefined behavior".

Fortunately, it's a simple change.  Would seven lines of source bloat
be considered unacceptible?  Note that this change isn't just for
theoretical consistency -- I find it very practical.  Because otherwise
I am forever saying

  grep -c ..... | grep -v :0

to get the same result.

Thanks,
Peter


--- src/grep.c~	Tue Feb  1 23:49:07 2000
+++ src/grep.c	Tue Oct 31 23:42:44 2000
@@ -849,7 +849,7 @@
     status = count + 2;
   else
     {
-      if (count_matches)
+      if (count_matches && (count || (count_matches == 1)))
 	{
 	  if (out_file)
 	    printf ("%s%c", filename, ':' & filename_mask);
@@ -1365,6 +1365,13 @@
 	break;
       }
 
+  /* grep -cl means count lines but skip "xxx:0" */
+  if (count_matches == 1 && list_files == 1)
+    {
+      list_files = 0;
+      count_matches = -1;
+      done_on_match = 0;
+    }
   if (out_after < 0)
     out_after = default_context;
   if (out_before < 0)