PERFORCE change 176833 for review

[Garrett Cooper]

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;