From owner-p4-projects@FreeBSD.ORG  Fri Jul 25 08:52:12 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5AFB61065670; Fri, 25 Jul 2008 08:52:12 +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 20BB8106567E
	for <perforce@freebsd.org>; Fri, 25 Jul 2008 08:52:12 +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 D294E8FC0A
	for <perforce@freebsd.org>; Fri, 25 Jul 2008 08:52:11 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m6P8qBfH030683
	for <perforce@freebsd.org>; Fri, 25 Jul 2008 08:52:11 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6P8qB4X030681
	for perforce@freebsd.org; Fri, 25 Jul 2008 08:52:11 GMT
	(envelope-from gabor@freebsd.org)
Date: Fri, 25 Jul 2008 08:52:11 GMT
Message-Id: <200807250852.m6P8qB4X030681@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 145873 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: Fri, 25 Jul 2008 08:52:12 -0000

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

Change 145873 by gabor@gabor_server on 2008/07/25 08:52:00

	IFC

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/src/usr.bin/grep/file.c#3 integrate

Differences ...

==== //depot/projects/soc2008/gabor_textproc/src/usr.bin/grep/file.c#3 (text+ko) ====

@@ -152,7 +152,7 @@
 	}
 
 	/* Read a line whether from the buffer or from the file itself. */
-	for (i = 0; !grep_feof(f); i++) {
+	for (i = 0; !(grep_feof(f) && (binbufptr == &binbuf[binbufsiz])); i++) {
 		if (binbufptr == &binbuf[binbufsiz]) {
 			ch = grep_fgetc(f);
 		} else {