svn commit: r210479 - head/usr.bin/grep

[Doug Barton]

On Sun, 25 Jul 2010, Gabor Kovesdan wrote:

> Author: gabor
> Date: Sun Jul 25 18:57:48 2010
> New Revision: 210479
> URL: http://svn.freebsd.org/changeset/base/210479
>
> Log:
>  - Fix -l and -L by really surpressing output and just showing filenames
>
>  Submitted by:	swell.k at gmail.com

.... and dougb. :)  (It was part of the patch I sent on Friday.)

And not to pile on, but regression testing should have caught this. 
First by you, and if all else fails, by your mentor. At very least the 
thought process could have gone something like: "Let's see, the patch 
that I/Gabor generated to fix this problem is different than the one 
Doug generated. Now Doug is not a _complete_ moron, so let's take a 
careful look at this change and see if it really does what we think it 
should do."

Aside from the fact that despite its innocuous appearance grep really is 
an important tool; I've expressed frustration in the past that mentors 
are not in place to simply rubber stamp things. Mentors serve at least 2 
critical functions; to introduce mentees to "The FreeBSD Culture," and 
to sanity-check changes. No matter how technically competent the mentee 
is (and obviously Gabor is a sharp guy) both of these functions are 
critical to their successful introduction into the wonderful world of 
DougBS^W I mean, uh, FreeBSD. :)


Doug

>  Approved by:	delphij (mentor)
>
> Modified:
>  head/usr.bin/grep/util.c
>
> Modified: head/usr.bin/grep/util.c
> ==============================================================================
> --- head/usr.bin/grep/util.c	Sun Jul 25 18:32:59 2010	(r210478)
> +++ head/usr.bin/grep/util.c	Sun Jul 25 18:57:48 2010	(r210479)
> @@ -343,7 +343,7 @@ procline(struct str *l, int nottext)
> 		return (c); /* Binary file */
>
> 	/* Dealing with the context */
> -	if ((tail || c) && !cflag && !qflag) {
> +	if ((tail || c) && !cflag && !qflag && !lflag && !Lflag) {
> 		if (c) {
> 			if (!first && !prev && !tail && Aflag)
> 				printf("--\n");
>
>


-- 

 	Improve the effectiveness of your Internet presence with
 	a domain name makeover!    http://SupersetSolutions.com/

 	Computers are useless. They can only give you answers.
 			-- Pablo Picasso