From owner-p4-projects@FreeBSD.ORG  Wed Jul 23 15:28:25 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7B6A71065677; Wed, 23 Jul 2008 15:28:25 +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 3D8C81065695
	for <perforce@freebsd.org>; Wed, 23 Jul 2008 15:28:25 +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 341F28FC1A
	for <perforce@freebsd.org>; Wed, 23 Jul 2008 15:28:25 +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 m6NFSPS7006644
	for <perforce@freebsd.org>; Wed, 23 Jul 2008 15:28:25 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6NFSPIb006642
	for perforce@freebsd.org; Wed, 23 Jul 2008 15:28:25 GMT
	(envelope-from gabor@freebsd.org)
Date: Wed, 23 Jul 2008 15:28:25 GMT
Message-Id: <200807231528.m6NFSPIb006642@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 145719 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: Wed, 23 Jul 2008 15:28:25 -0000

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

Change 145719 by gabor@gabor_server on 2008/07/23 15:27:58

	- Move the previous fix to the right place

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/file.c#26 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/grep/file.c#26 (text+ko) ====

@@ -129,8 +129,10 @@
 		/* Only pre-read to the buffer if we need the binary check. */
 		if (binbehave != BINFILE_TEXT) {
 			for (; i < (BUFSIZ * sizeof(wint_t)); i++) {
-				if (grep_feof(f))
+				if (grep_feof(f)) {
+					i--;
 					break;
+				}
 				ch = grep_fgetc(f);
 				binbuf[i] = ch;
 			}
@@ -156,10 +158,8 @@
 	/* Read a line whether from the buffer or from the file itself. */
 	for (i = 0; ; i++) {
 		if (binbufptr == &binbuf[binbufsiz]) {
-			if (grep_feof(f)) {
-				i--;
+			if (grep_feof(f))
 				break;
-			}
 			ch = grep_fgetc(f);
 		} else {
 			ch = binbufptr[0];