From owner-p4-projects@FreeBSD.ORG  Thu Dec 25 04:52: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 3C96E1065674; Thu, 25 Dec 2008 04:52: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 F2A221065670
	for <perforce@freebsd.org>; Thu, 25 Dec 2008 04:52:24 +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 E05B78FC1A
	for <perforce@freebsd.org>; Thu, 25 Dec 2008 04:52:24 +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 mBP4qOEW055870
	for <perforce@freebsd.org>; Thu, 25 Dec 2008 04:52:24 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBP4qOUI055868
	for perforce@freebsd.org; Thu, 25 Dec 2008 04:52:24 GMT
	(envelope-from gabor@freebsd.org)
Date: Thu, 25 Dec 2008 04:52:24 GMT
Message-Id: <200812250452.mBP4qOUI055868@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 155260 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:52:25 -0000

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

Change 155260 by gabor@gabor_server on 2008/12/25 04:51:32

	- Fix file handling bugs

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/file.c#34 edit
.. //depot/projects/soc2008/gabor_textproc/grep/util.c#77 edit

Differences ...

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

@@ -118,7 +118,7 @@
 grep_fgetln(struct file *f, size_t *len)
 {
 	int		 i = 0;
-	char		 ch;
+	int		 ch = 0;
 
 	/* Fill in the buffer if it is empty. */
 	if (binbufptr == NULL) {
@@ -149,11 +149,16 @@
 			lnbuflen *= 2;
 			lnbuf = grep_realloc(lnbuf, ++lnbuflen);
 		}
-		if (ch == '\n')
+		if (ch == '\n') {
+			lnbuf[i] = '\0';
+			break;
+		}
+		if (ch != EOF)
+			lnbuf[i] = ch;
+		else
 			break;
-		lnbuf[i] = ch;
 	}
-	if (grep_feof(f) && (i == 0))
+	if (grep_feof(f) && (i == 0) && (ch != '\n'))
 		return (NULL);
 	*len = i;
 	return (lnbuf);
@@ -228,4 +233,8 @@
 		break;
 	}
 	free(f);
+
+	/* Reset read buffer for the file we are closing */
+	binbufptr = NULL;
+
 }

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

@@ -114,8 +114,6 @@
 			} else
 				ok = 1;
 			if (ok)
-				/* Reset read buffer before reading other file */
-				binbufptr = NULL;
 				c += procfile(p->fts_path);
 			break;
 		}