From owner-p4-projects@FreeBSD.ORG  Tue Jul 15 13:55:16 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E52F41065679; Tue, 15 Jul 2008 13:55:15 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A83C21065678
	for <perforce@freebsd.org>; Tue, 15 Jul 2008 13:55:15 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 885E88FC24
	for <perforce@freebsd.org>; Tue, 15 Jul 2008 13:55:15 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m6FDtFwD050503
	for <perforce@freebsd.org>; Tue, 15 Jul 2008 13:55:15 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6FDtFEQ050501
	for perforce@freebsd.org; Tue, 15 Jul 2008 13:55:15 GMT
	(envelope-from gabor@freebsd.org)
Date: Tue, 15 Jul 2008 13:55:15 GMT
Message-Id: <200807151355.m6FDtFEQ050501@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 145281 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Jul 2008 13:55:16 -0000

http://perforce.freebsd.org/chv.cgi?CH=145281

Change 145281 by gabor@gabor_server on 2008/07/15 13:54:55

	- Fix -v behaviour [1]
	- Indenting
	
	Reported by:	kris [1]

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/util.c#63 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/grep/util.c#63 (text+ko) ====

@@ -283,13 +283,10 @@
 	} else
 		c = !vflag;
 
-	if (vflag)
-		c = !c;
-
 	if (c && binbehave == BINFILE_BIN && nottext)
 		return (c); /* Binary file */
 
-	if ((tail || c) && !cflag && !qflag) {
+	if ((tail || (c && !vflag)) && !cflag && !qflag) {
 		if (c) {
 			if (!first && !prev && !tail && Aflag)
 				printf("--\n");
@@ -380,8 +377,9 @@
 				fwrite(line->dat + a, matches[i].rm_so - a, 1, stdout);
 			if (color) 
 				fprintf(stdout, "\33[%sm\33[K", color);
+
 				fwrite(line->dat + matches[i].rm_so, 
-				matches[i].rm_eo - matches[i].rm_so, 1, stdout);
+				    matches[i].rm_eo - matches[i].rm_so, 1, stdout);
 			if (color) 
 				fprintf(stdout, "\33[00m\33[K");
 			a = matches[i].rm_eo;