From owner-p4-projects@FreeBSD.ORG  Thu Dec 25 04:54:27 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9F8BB1065677; Thu, 25 Dec 2008 04:54:27 +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 63FB61065673
	for <perforce@freebsd.org>; Thu, 25 Dec 2008 04:54:27 +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 51F3D8FC17
	for <perforce@freebsd.org>; Thu, 25 Dec 2008 04:54:27 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBP4sR89056007
	for <perforce@freebsd.org>; Thu, 25 Dec 2008 04:54:27 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBP4sQ6J056005
	for perforce@freebsd.org; Thu, 25 Dec 2008 04:54:26 GMT
	(envelope-from gabor@freebsd.org)
Date: Thu, 25 Dec 2008 04:54:26 GMT
Message-Id: <200812250454.mBP4sQ6J056005@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 155261 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: Thu, 25 Dec 2008 04:54:28 -0000

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

Change 155261 by gabor@gabor_server on 2008/12/25 04:54:25

	- Some simplifications

Affected files ...

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

Differences ...

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

@@ -124,13 +124,8 @@
 	if (binbufptr == NULL) {
 		/* Only pre-read to the buffer if we need the binary check. */
 		if (binbehave != BINFILE_TEXT) {
-			for (; i < sizeof(binbuf) && !grep_feof(f); i++) {
-				ch = grep_fgetc(f);
-				if (ch != EOF)
-					binbuf[i] = ch;
-				else
-					break;
-			}
+			for (; i < sizeof(binbuf) && !grep_feof(f); i++)
+				binbuf[i] = grep_fgetc(f);
 			f->binary = memchr(binbuf, (filebehave != FILE_GZIP) ? '\0' : '\200', i - 1) != 0;
 		}
 		binbufsiz = i;
@@ -149,14 +144,11 @@
 			lnbuflen *= 2;
 			lnbuf = grep_realloc(lnbuf, ++lnbuflen);
 		}
-		if (ch == '\n') {
+		if ((ch == '\n') || (ch == EOF)) {
 			lnbuf[i] = '\0';
 			break;
-		}
-		if (ch != EOF)
+		} else
 			lnbuf[i] = ch;
-		else
-			break;
 	}
 	if (grep_feof(f) && (i == 0) && (ch != '\n'))
 		return (NULL);