From owner-p4-projects@FreeBSD.ORG  Tue Jun 17 13:22:53 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 98EE6106567B; Tue, 17 Jun 2008 13:22:53 +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 5A0321065671
	for <perforce@freebsd.org>; Tue, 17 Jun 2008 13:22:53 +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 45B308FC16
	for <perforce@freebsd.org>; Tue, 17 Jun 2008 13:22:53 +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 m5HDMrqq046547
	for <perforce@freebsd.org>; Tue, 17 Jun 2008 13:22:53 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5HDMrp9046545
	for perforce@freebsd.org; Tue, 17 Jun 2008 13:22:53 GMT
	(envelope-from gabor@freebsd.org)
Date: Tue, 17 Jun 2008 13:22:53 GMT
Message-Id: <200806171322.m5HDMrp9046545@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 143641 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, 17 Jun 2008 13:22:53 -0000

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

Change 143641 by gabor@gabor_server on 2008/06/17 13:22:05

	- Improve compatibility of -B

Affected files ...

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

Differences ...

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

@@ -276,7 +276,7 @@
 
 	if ((tail || c) && !cflag && !qflag) {
 		if (c) {
-			if (!first && !prev && !tail && (Aflag || Bflag))
+			if (!first && !prev && !tail && Aflag)
 				printf("--\n");
 			tail = Aflag;
 			if (Bflag > 0)
@@ -284,16 +284,19 @@
 			linesqueued = 0;
 			printline(l, ':');
 		} else {
-			prev = 0;
 			printline(l, '-');
 			tail--;
 		}
 	}
 
+	if (!c && Bflag && prev)
+		printf("--\n");
+
 	if (c) {
 		prev++;
 		first = 0;
-	}
+	} else
+		prev = 0;
 
 	return (c);
 }