 @@ -1,27 +1,27 @@
-/*	$NetBSD: perform.c,v 1.23.2.7 2008/08/05 19:37:48 joerg Exp $	*/
+/*	$NetBSD: perform.c,v 1.23.2.8 2008/08/05 20:41:04 joerg Exp $	*/
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
 #ifndef lint
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.15 1997/10/13 15:03:52 jkh Exp";
 #else
-__RCSID("$NetBSD: perform.c,v 1.23.2.7 2008/08/05 19:37:48 joerg Exp $");
+__RCSID("$NetBSD: perform.c,v 1.23.2.8 2008/08/05 20:41:04 joerg Exp $");
 #endif
 #endif
 /*
  * FreeBSD install - a package for the installation and maintainance
  * of non-core utilities.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -547,47 +547,47 @@ require_print(void)
 	while ((lpp = TAILQ_FIRST(&lpdelq))) {
 		TAILQ_REMOVE(&lpdelq, lpp, lp_link);
 		fprintf(stderr, "\t%s\n", lpp->lp_name);
 		free_lpkg(lpp);
+	}
+}
 /*
  * This is seriously ugly code following.  Written very fast!
  */
 static int
 pkg_do(char *pkg)
+{
 	char	       *pkgdir, *fname;
 	plist_t	       *p;
 	FILE	       *cfile;
 	FILE	       *fp;
 	char    	home[MaxPathSize];
 	char    	view[MaxPathSize];
 	int		cc;
 	Boolean		is_depoted_pkg = FALSE;
 	/* Reset some state */
 	if (Plist.head)
 		free_plist(&Plist);
-	(void) snprintf(LogDir, sizeof(LogDir), "%s/%s",
+	pkgdir = xasprintf("%s/%s", _pkgdb_getPKGDB_DIR(), pkg);
-	    _pkgdb_getPKGDB_DIR(), pkg);
+	if (!fexists(pkgdir) || !(isdir(pkgdir) || islinktodir(pkgdir))) {
 	if (!fexists(LogDir) || !(isdir(LogDir) || islinktodir(LogDir))) {
 		/* Check if the given package name matches something
 		 * with 'pkg-[0-9]*' */
 		lpkg_head_t     trypkgs;
 		lpkg_t	       *lpp;
 		int		qlen = 0;
 		free(pkgdir);
 		TAILQ_INIT(&trypkgs);
 		switch (add_installed_pkgs_by_basename(pkg, &trypkgs)) {
 		case 0:
 			warnx("package '%s' not installed", pkg);
 			return 1;
 		case -1:
 			errx(EXIT_FAILURE, "Error during search in pkgdb for %s", pkg);
+		}
 		TAILQ_FOREACH(lpp, &trypkgs, lp_link)
 			qlen++;
 @@ -601,218 +601,267 @@ pkg_do(char *pkg)
 			return 1;
+		}
 		/*
 		 * Append the package names we've discovered to the
 		 * pkgs list after this one, and return 0 so that we
 		 * continue processing the pkgs list.
 		 */
 		TAILQ_FOREACH(lpp, &trypkgs, lp_link)
 			TAILQ_INSERT_TAIL(&pkgs, lpp, lp_link);
 		return 0;
+	}
 	free(pkgdir);
 	setenv(PKG_REFCOUNT_DBDIR_VNAME, pkgdb_refcount_dir(), 1);
-	if (!getcwd(home, MaxPathSize)) {
+	fname = pkgdb_pkg_file(pkg, CONTENTS_FNAME);
-		cleanup(0);
+	if (!fexists(fname)) {
-		errx(2, "unable to get current working directory!");
+		warnx("package '%s' is not installed, %s missing", pkg, fname);
 		if (!Force) {
-	if (chdir(LogDir) == FAIL) {
+			free(fname);
 		warnx("unable to change directory to %s! deinstall failed", LogDir);
 		return 1;
 	if (!fexists(CONTENTS_FNAME)) {
 		warnx("package '%s' is not installed, %s missing", pkg, CONTENTS_FNAME);
 		if (!Force)
 			return 1;
+		}
+	}
-	if (fexists(PRESERVE_FNAME)) {
+	free(fname);
 	fname = pkgdb_pkg_file(pkg, PRESERVE_FNAME);
 	if (fexists(fname)) {
 		printf("Package `%s' is marked as not for deletion\n", pkg);
 		if (Force <= (NoDeleteFiles ? 0 : 1)) {
 			free(fname);
 			return 1;
+		}
 		printf("Deleting anyway\n");
+	}
-	if (!isemptyfile(REQUIRED_BY_FNAME)) {
+	free(fname);
 	fname = pkgdb_pkg_file(pkg, REQUIRED_BY_FNAME);
 	if (!isemptyfile(fname)) {
 		/* This package is required by others. Either nuke
 		 * them (-r), or stop. */
 		if (!Recurse_up)
 			warnx("package `%s' is required by other packages:", pkg);
 		else if (Verbose)
 			printf("Building list of packages that require `%s'"
 			    " to deinstall\n", pkg);
 		if (require_find(pkg, FIND_UP)) {
-			if (!Force || Recurse_up)
+			if (!Force || Recurse_up) {
 				free(fname);
 				return (1);
+			}
+		}
 		chdir(LogDir);	/* CWD was changed by require_find() */
 		if (!Recurse_up) {
 			require_print();
-			if (!Force)
+			if (!Force) {
 				free(fname);
 				return 1;
+			}
 		} else
 			require_delete(0);
+	}
-	if (!isemptyfile(VIEWS_FNAME)) {
+	free(fname);
 	fname = pkgdb_pkg_file(pkg, VIEWS_FNAME);
 	if (!isemptyfile(fname)) {
 		char view[MaxPathSize];
 		/* This package has instances in other views */
 		/* Delete them from the views */
-		if ((fp = fopen(VIEWS_FNAME, "r")) == NULL) {
+		if ((fp = fopen(fname, "r")) == NULL) {
-			warnx("unable to open '%s' file", VIEWS_FNAME);
+			warnx("unable to open '%s' file", fname);
 			free(fname);
 			return 1;
+		}
 		while (fgets(view, sizeof(view), fp) != NULL) {
 			if (view[cc = strlen(view) - 1] == '\n') {
 				view[cc] = 0;
+			}
 			if (Verbose) {
 				printf("Deleting package %s instance from `%s' view\n", pkg, view);
+			}
 			if (fexec_skipempty(ProgramPath, "-K", view,
 					    (Force > 1) ? "-f -f " : (Force == 1) ? "-f " : "",
 					    pkg, NULL) != 0) {
 				warnx("unable to delete package %s from view %s", pkg, view);
 				(void) fclose(fp);
 				free(fname);
 				return 1;
+			}
+		}
 		(void) fclose(fp);
+	}
-	sanity_check(LogDir);
+	free(fname);
 	cfile = fopen(CONTENTS_FNAME, "r");
-	if (!cfile) {
+	sanity_check(pkg);
-		warnx("unable to open '%s' file", CONTENTS_FNAME);
+	fname = pkgdb_pkg_file(pkg, CONTENTS_FNAME);
 	if ((cfile = fopen(fname, "r")) == NULL) {
 		warnx("unable to open '%s' file", fname);
 		free(fname);
 		return 1;
+	}
 	free(fname);
 	read_plist(&Plist, cfile);
 	fclose(cfile);
 	p = find_plist(&Plist, PLIST_CWD);
 	/* If we have a prefix, replace the first @cwd. */
 	if (Prefix) {
 		delete_plist(&Plist, FALSE, PLIST_CWD, NULL);
 		add_plist_top(&Plist, PLIST_CWD, Prefix);
+	}
 	if (!p) {
 		warnx("package '%s' doesn't have a prefix", pkg);
 		return 1;
+	}
 	if (Destdir != NULL)
 		setenv(PKG_DESTDIR_VNAME, Destdir, 1);
 	setenv(PKG_PREFIX_VNAME, p->name, 1);
 	setenv(PKG_METADATA_DIR_VNAME, LogDir, 1);
 	/*
 	 * Ensure that we don't do VIEW-DEINSTALL action for old packages
 	 * or for the package in its depot directory.
 	 */
-	if (!NoDeInstall && fexists(DEINSTALL_FNAME) && fexists(DEPOT_FNAME)) {
+	fname = pkgdb_pkg_file(pkg, DEINSTALL_FNAME);
 	if (!NoDeInstall && fexists(fname)) {
 		const char *target, *text;
 		char *fname2;
 		fname2 = pkgdb_pkg_file(pkg, DEPOT_FNAME);
 		if (fexists(fname2)) {
 			target = "VIEW-DEINSTALL";
 			text = "view deinstall";
 		} else {
 			target = "DEINSTALL";
 			text = "deinstall";
+		}
 		free(fname2);
 		if (Fake) {
-			printf("Would execute view de-install script at this point (arg: VIEW-DEINSTALL).\n");
+			printf("Would execute %s script at this point "
 			    "(arg: %s).\n", text, target);
 		} else {
-			(void) fexec(CHMOD_CMD, "+x", DEINSTALL_FNAME, NULL);	/* make sure */
+			pkgdir = xasprintf("%s/%s", _pkgdb_getPKGDB_DIR(), pkg);
-			if (fexec("./" DEINSTALL_FNAME, pkg, "VIEW-DEINSTALL", NULL)) {
+			(void) fexec(CHMOD_CMD, "+x", fname, NULL);	/* make sure */
-				warnx("view deinstall script returned error status");
+			if (fcexec(pkgdir, fname, pkg, target, NULL)) {
 				warnx("%s script returned error status", text);
 				if (!Force) {
 					free(pkgdir);
 					return 1;
+				}
+			}
 			free(pkgdir);
+		}
+	}
-	if (!NoDeInstall && fexists(DEINSTALL_FNAME) && !fexists(DEPOT_FNAME)) {
+	free(fname);
 		if (Fake)
 			printf("Would execute de-install script at this point (arg: DEINSTALL).\n");
 		else {
 			(void) fexec(CHMOD_CMD, "+x", DEINSTALL_FNAME, NULL);	/* make sure */
 			if (fexec("./" DEINSTALL_FNAME, pkg, "DEINSTALL", NULL)) {
 				warnx("deinstall script returned error status");
 				if (!Force)
 					return 1;
 	if (!Fake) {
 		/* Some packages aren't packed right, so we need to just ignore delete_package()'s status.  Ugh! :-( */
 		if (delete_package(FALSE, CleanDirs, &Plist, NoDeleteFiles, Destdir) == FAIL)
 			warnx("couldn't entirely delete package `%s'\n", pkg);
 	} else {   /* Fake means Verbose */
 	else {   /* Fake means Verbose */
 		printf("Attempting to delete package `%s'\n", pkg);
+	}
-	if (!isemptyfile(DEPOT_FNAME)) {
+	fname = pkgdb_pkg_file(pkg, DEPOT_FNAME);
 	if (!isemptyfile(fname)) {
 		if (Verbose)
-			printf("Attempting to remove the %s registration on package `%s'\n", VIEWS_FNAME, pkg);
+			printf("Attempting to remove the %s registration"
 			    " on package `%s'\n", fname, pkg);
 		if (!Fake)
 			(void) unview(pkg);
+	}
 	/*
 	 * If this isn't a package in a view, then remove this package
 	 * from the +REQUIRED_BY list of the packages this depends on.
 	 */
-	if (!fexists(DEPOT_FNAME)) {
+	if (!fexists(fname)) {
 		for (p = Plist.head; p; p = p->next) {
 			if (p->type != PLIST_PKGDEP)
 				continue;
 			if (Verbose)
 				printf("Attempting to remove dependency on package `%s'\n", p->name);
 			if (!Fake)
 				match_installed_pkgs(p->name, undepend, pkg);
+		}
+	}
 	free(fname);
 	if (Recurse_down) {
 		/* Also remove the packages further down, now that there's
 		 * (most likely) nothing left which requires them. */
 		if (Verbose)
 			printf("Building list of packages that `%s' required\n", pkg);
 		if (require_find(pkg, FIND_DOWN))
 			return (1);
 		require_delete(1);
+	}
 	if (!NoDeInstall && fexists(DEINSTALL_FNAME) && !fexists(DEPOT_FNAME)) {
-		if (Fake)
+	fname = pkgdb_pkg_file(pkg, DEINSTALL_FNAME);
-			printf("Would execute post-de-install script at this point (arg: POST-DEINSTALL).\n");
+	if (!NoDeInstall && fexists(fname)) {
-		else {
+		char *fname2;
 			(void) fexec(CHMOD_CMD, "+x", DEINSTALL_FNAME, NULL);	/* make sure */
-			if (fexec("./" DEINSTALL_FNAME, pkg, "POST-DEINSTALL", NULL)) {
+		fname2 = pkgdb_pkg_file(pkg, DEPOT_FNAME);
-				warnx("post-deinstall script returned error status");
+		if (!fexists(fname2)) {
-				if (!Force)
+			if (Fake)
-					return 1;
+				printf("Would execute post-de-install script at this point (arg: POST-DEINSTALL).\n");
 			else {
 				pkgdir = xasprintf("%s/%s", _pkgdb_getPKGDB_DIR(), pkg);
 				(void) fexec(CHMOD_CMD, "+x", fname, NULL);	/* make sure */
 				if (fcexec(pkgdir, fname, pkg, "POST-DEINSTALL", NULL)) {
 					warnx("post-deinstall script returned error status");
 					if (!Force) {
 						free(pkgdir);
 						free(fname);
 						free(fname2);
 						return 1;
+					}
+				}
 				free(pkgdir);
+			}
+		}
 		free(fname2);
+	}
-	if (fexists(VIEWS_FNAME))
+	free(fname);
 	fname = pkgdb_pkg_file(pkg, VIEWS_FNAME);
 	if (fexists(fname))
 		is_depoted_pkg = TRUE;
 	free(fname);
 	/* Change out of LogDir before we remove it.
 	 * Do not fail here, as the package is not yet completely deleted! */
 	if (chdir(home) == FAIL)
 		warnx("Oops - removed current working directory.  Oh, well.");
 	if (!Fake) {
 		/* Finally nuke the +-files and the pkgdb-dir (/var/db/pkg/foo) */
-		(void) remove_files(LogDir, "+*");
+		pkgdir = xasprintf("%s/%s", _pkgdb_getPKGDB_DIR(), pkg);
-		if (isemptydir(LogDir))
+		(void) remove_files(pkgdir, "+*");
-			(void)rmdir(LogDir);
+		if (isemptydir(pkgdir))
 			(void)rmdir(pkgdir);
 		else if (is_depoted_pkg)
-			warnx("%s is not empty", LogDir);
+			warnx("%s is not empty", pkgdir);
 		else if (Force) {
-			if (fexec(REMOVE_CMD, "-rf", LogDir, NULL) != 0) {
+			if (fexec(REMOVE_CMD, "-rf", pkgdir, NULL) != 0) {
-				warnx("couldn't remove log entry in %s", LogDir);
+				warnx("couldn't remove log entry in %s", pkgdir);
 				free(pkgdir);
 				return 1;
 			} else {
-				warnx("log entry forcefully removed in %s", LogDir);
+				warnx("log entry forcefully removed in %s", pkgdir);
 				free(pkgdir);
 				return 0;
+			}
 		} else {
-			warnx("couldn't remove log entry in %s", LogDir);
+			warnx("couldn't remove log entry in %s", pkgdir);
 			free(pkgdir);
 			return 1;
+		}
 		free(pkgdir);
+	}
 	return 0;
+}
 int
 pkg_perform(lpkg_head_t *pkghead)
+{
 	int     err_cnt = 0;
 	int     oldcwd;
 	lpkg_t *lpp;
 	/* save cwd */
 	oldcwd = open(".", O_RDONLY, 0);