From owner-p4-projects@FreeBSD.ORG  Thu Apr 27 00:19:00 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 090C816A404; Thu, 27 Apr 2006 00:19:00 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id DC82616A400
	for <perforce@freebsd.org>; Thu, 27 Apr 2006 00:18:59 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id ABC4C43D46
	for <perforce@freebsd.org>; Thu, 27 Apr 2006 00:18:59 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3R0Ixvw050502
	for <perforce@freebsd.org>; Thu, 27 Apr 2006 00:18:59 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3R0Ixr6050496
	for perforce@freebsd.org; Thu, 27 Apr 2006 00:18:59 GMT
	(envelope-from jb@freebsd.org)
Date: Thu, 27 Apr 2006 00:18:59 GMT
Message-Id: <200604270018.k3R0Ixr6050496@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 96176 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, 27 Apr 2006 00:19:00 -0000

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

Change 96176 by jb@jb_freebsd2 on 2006/04/27 00:18:54

	Fix the YY_INPUT definition when filling the input buffer from
	a file.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_lex.l#4 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_lex.l#4 (text) ====

@@ -51,17 +51,9 @@
  */
 #define YY_INPUT(buf,result,max_size) \
 	if (yypcb->pcb_fileptr != NULL) { \
-		int n; \
-		for (n = 0; n < max_size && \
-		    ferror(yypcb->pcb_fileptr) == 0; n++) { \
-			int c = fgetc(yypcb->pcb_fileptr); \
-			if (c == EOF) \
-				break; \
-			buf[n] = c; \
-		} \
-		if (yypcb->pcb_fileptr != NULL && ferror(yypcb->pcb_fileptr)) \
+		if (((result = fread(buf, 1, max_size, yypcb->pcb_fileptr)) == 0) \
+		    && ferror(yypcb->pcb_fileptr)) \
 			longjmp(yypcb->pcb_jmpbuf, EDT_FIO); \
-		return n; \
 	} else { \
 		int n; \
 		for (n = 0; n < max_size && \