From owner-p4-projects@FreeBSD.ORG  Sun Jul 15 00:51:24 2007
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 936DC16A406; Sun, 15 Jul 2007 00:51:24 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 5FCBA16A404
	for <perforce@FreeBSD.org>; Sun, 15 Jul 2007 00:51:24 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 50D0113C491
	for <perforce@FreeBSD.org>; Sun, 15 Jul 2007 00:51:24 +0000 (UTC)
	(envelope-from gcooper@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 l6F0pOeG084913
	for <perforce@FreeBSD.org>; Sun, 15 Jul 2007 00:51:24 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6F0pOrl084910
	for perforce@freebsd.org; Sun, 15 Jul 2007 00:51:24 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Sun, 15 Jul 2007 00:51:24 GMT
Message-Id: <200707150051.l6F0pOrl084910@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gcooper@FreeBSD.org using -f
From: Garrett Cooper <gcooper@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 123511 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: Sun, 15 Jul 2007 00:51:24 -0000

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

Change 123511 by gcooper@optimus-revised_pkgtools on 2007/07/15 00:50:56

	Much faster way to read a packing list. Inspired by Tim Kientzle (kientzle).

Affected files ...

.. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/plist.c#7 edit

Differences ...

==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/lib/plist.c#7 (text+ko) ====

@@ -309,7 +309,7 @@
 	}
 	++cp, ++sp;
     }
-    printf("COMMAND STRING: %s\nCMD: %s\nCP: %s\nSP: %s\n", s, cmd, cp, sp);
+    printf("COMMAND STRING: %s\nCMD"/*: %s\nCP: %s\nSP: %s\n"*/, s/*, cmd, cp, sp*/);
 
     if(!*(cmd+1))
 	return FAIL;
@@ -422,8 +422,6 @@
 
     int cmd;
 
-    unsigned int i = 0;
-
     pkg->fmtver_maj = 1;
     pkg->fmtver_mnr = 2;
     pkg->origin = NULL;
@@ -434,18 +432,12 @@
     /* Empty file -- don't attempt to process */
     assert(contents_stat.st_size != 0);
 
-    plines = (char*) malloc(contents_stat.st_size);
+    plines = (char*) malloc(contents_stat.st_size+1);
 
-    for(i = 0; !feof(fp) && i < contents_stat.st_size; i++)
-	*(plines+i) = fgetc(fp);
-
-//    printf("+CONTENTS DUMP: %s\n", plines);
-
-    /* Avoid strangely crafted files with zero-length, but non-zero size */
-    assert(0 != i);
+    assert(contents_stat.st_size == read(fileno(fp), plines, contents_stat.st_size+1));
 
     /* Just in case file doesn't have EOF */
-    *(plines+i) = '\0';
+    *(plines+contents_stat.st_size) = '\0';
 
     pline = strtok(plines, "\n");