From owner-p4-projects@FreeBSD.ORG  Tue Mar 10 23:01:20 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B40CA10656EE; Tue, 10 Mar 2009 23:01:20 +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 70E251065702
	for <perforce@freebsd.org>; Tue, 10 Mar 2009 23:01:20 +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 5F54D8FC19
	for <perforce@freebsd.org>; Tue, 10 Mar 2009 23:01:20 +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 n2AN1KWd016620
	for <perforce@freebsd.org>; Tue, 10 Mar 2009 23:01:20 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2AN1KpR016618
	for perforce@freebsd.org; Tue, 10 Mar 2009 23:01:20 GMT
	(envelope-from gabor@freebsd.org)
Date: Tue, 10 Mar 2009 23:01:20 GMT
Message-Id: <200903102301.n2AN1KpR016618@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 159037 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, 10 Mar 2009 23:01:22 -0000

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

Change 159037 by gabor@gabor_server on 2009/03/10 23:01:18

	- Fix EOF handling
	
	Thanks to: ed, delphij, James Bailie <jimmy@mammothcheese.ca>

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/file.c#41 edit
.. //depot/projects/soc2008/gabor_textproc/grep/grep.h#46 edit

Differences ...

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

@@ -60,9 +60,9 @@
 /* Some global variable for the buffering and reading. */
 static char	*lnbuf;
 static size_t	 lnbuflen;
-static char	*binbuf;
+static unsigned char *binbuf;
 static int	 binbufsiz;
-char		*binbufptr;
+unsigned char	*binbufptr;
 static int	 bzerr;
 
 #define iswbinary(ch)	(!iswspace((ch)) && iswcntrl((ch)) && (ch != L'\b') && (ch != L'\0'))
@@ -74,7 +74,7 @@
 int
 grep_fgetc(struct file *f)
 {
-	char	 c;
+	int	 c;
 
 	switch (filebehave) {
 	case FILE_STDIO:
@@ -141,8 +141,13 @@
 
 			binbuf = grep_malloc(sizeof(char) * bufsiz);
 
-			for (; i < bufsiz && !grep_feof(f); i++)
-				binbuf[i] = grep_fgetc(f);
+			while (i < bufsiz) {
+				ch = grep_fgetc(f);
+				if (ch == EOF)
+					break;
+				binbuf[i++] = ch;
+			}
+
 			f->binary = memchr(binbuf, (filebehave != FILE_GZIP) ? '\0' : '\200', i - 1) != 0;
 		}
 		binbufsiz = i;

==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#46 (text+ko) ====

@@ -144,7 +144,7 @@
 void	 clearqueue(void);
 
 /* file.c */
-char		*binbufptr;
+unsigned char	*binbufptr;
 
 void		 grep_close(struct file *f);
 struct file	*grep_stdin_open(void);