From owner-p4-projects@FreeBSD.ORG  Mon Apr 12 13:14:39 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5D8AD1065672; Mon, 12 Apr 2010 13:14:39 +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 22301106566B
	for <perforce@FreeBSD.org>; Mon, 12 Apr 2010 13:14:39 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0FF628FC0A
	for <perforce@FreeBSD.org>; Mon, 12 Apr 2010 13:14:39 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3CDEcBh043983
	for <perforce@FreeBSD.org>; Mon, 12 Apr 2010 13:14:38 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3CDEcrG043981
	for perforce@freebsd.org; Mon, 12 Apr 2010 13:14:38 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Mon, 12 Apr 2010 13:14:38 GMT
Message-Id: <201004121314.o3CDEcrG043981@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>
Precedence: bulk
Cc: 
Subject: PERFORCE change 176833 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Mon, 12 Apr 2010 13:14:39 -0000

http://p4web.freebsd.org/@@176833?ac=10

Change 176833 by gcooper@gcooper-bayonetta on 2010/04/12 13:13:57

	Remove all leftover references to pkg_fullname; there's no reason why we need another copy of pkg hanging around.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/add/perform.c#6 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/add/perform.c#6 (text+ko) ====

@@ -63,7 +63,6 @@
     struct stat sb;
     Package Plist;
     PackingList p;
-    char pkg_fullname[FILENAME_MAX];
     char playpen[FILENAME_MAX];
     char pre_script[FILENAME_MAX] = INSTALL_FNAME;
     char post_script[FILENAME_MAX];
@@ -345,7 +344,7 @@
 		if (!isURL(pkg) && !getenv("PKG_ADD_BASE")) {
 		    const char *ext;
 
-		    ext = strrchr(pkg_fullname, '.');
+		    ext = strrchr(pkg, '.');
 		    if (ext == NULL)
 			ext = ".tbz";
 		    snprintf(path, FILENAME_MAX, "%s/%s%s", getenv("_TOP"), p->name, ext);
@@ -417,7 +416,7 @@
 	if (Verbose)
 	    printf("Running requirements file first for %s..\n", Plist.name);
 	if (!Fake && vsystem("./%s %s INSTALL", REQUIRE_FNAME, Plist.name)) {
-	    warnx("package %s fails requirements %s", pkg_fullname,
+	    warnx("package %s fails requirements %s", pkg,
 		   Force ? "installing anyway" : "- not installed");
 	    if (!Force) {
 		code = 1;