 @@ -1,27 +1,27 @@
-/*	$NetBSD: perform.c,v 1.23.2.4 2008/08/05 19:01:27 joerg Exp $	*/
+/*	$NetBSD: perform.c,v 1.23.2.5 2008/08/05 19:09:35 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.4 2008/08/05 19:01:27 joerg Exp $");
+__RCSID("$NetBSD: perform.c,v 1.23.2.5 2008/08/05 19:09:35 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
 @@ -161,103 +161,99 @@ undepend(const char *deppkgname, void *v
 	free(fname);
 	free(fname_tmp);
 	return 0;
+}
 /*
  * Remove the current view's package dbdir from the +VIEWS file of the
  * depoted package named by pkgname.
  */
 static int
 unview(const char *pkgname)
+{
-	char  fname[MaxPathSize], ftmp[MaxPathSize];
+	const char *dbdir;
 	char *fname, *fname_tmp;
 	char  fbuf[MaxPathSize];
 	char  dbdir[MaxPathSize];
 	FILE *fp, *fpwr;
-	int  s;
+	int  rv;
 	int  cc;
-	(void) snprintf(dbdir, sizeof(dbdir), "%s", _pkgdb_getPKGDB_DIR());
+	dbdir = _pkgdb_getPKGDB_DIR();
-	/* Get the depot directory. */
+	fname = pkgdb_pkg_file(pkgname, DEPOT_FNAME);
 	(void) snprintf(fname, sizeof(fname), "%s/%s/%s",
 	    dbdir, pkgname, DEPOT_FNAME);
 	if ((fp = fopen(fname, "r")) == NULL) {
 		warnx("unable to open `%s' file", fname);
 		return -1;
+	}
 	if (fgets(fbuf, sizeof(fbuf), fp) == NULL) {
 		(void) fclose(fp);
 		warnx("empty depot file `%s'", fname);
 		free(fname);
 		return -1;
+	}
 	if (fbuf[cc = strlen(fbuf) - 1] == '\n') {
 		fbuf[cc] = 0;
+	}
 	fclose(fp);
 	free(fname);
 	/*
 	 * Copy the contents of the +VIEWS file into a temp file, but
 	 * skip copying the name of the current view's package dbdir.
 	 */
-	(void) snprintf(fname, sizeof(fname), "%s/%s", fbuf, VIEWS_FNAME);
+	fname = pkgdb_pkg_file(pkgname, VIEWS_FNAME);
 	fname_tmp = pkgdb_pkg_file(pkgname, VIEWS_FNAME_TMP);
 	if ((fp = fopen(fname, "r")) == NULL) {
 		warnx("unable to open `%s' file", fname);
 		free(fname);
 		free(fname_tmp);
 		return -1;
+	}
-	(void) snprintf(ftmp, sizeof(ftmp), "%s.XXXXXX", fname);
+	if ((fpwr = fopen(fname_tmp, "w")) == NULL) {
 	if ((s = mkstemp(ftmp)) == -1) {
 		(void) fclose(fp);
 		warnx("unable to open `%s' temp file", ftmp);
 		return -1;
 	if ((fpwr = fdopen(s, "w")) == NULL) {
 		(void) close(s);
 		(void) remove(ftmp);
 		(void) fclose(fp);
-		warnx("unable to fdopen `%s' temp file", ftmp);
+		warnx("unable to fopen `%s' temporary file", fname_tmp);
 		free(fname);
 		free(fname_tmp);
 		return -1;
+	}
 	while (fgets(fbuf, sizeof(fbuf), fp) != NULL) {
 		if (fbuf[cc = strlen(fbuf) - 1] == '\n') {
 			fbuf[cc] = 0;
+		}
 		if (strcmp(fbuf, dbdir) != 0) {
 			(void) fputs(fbuf, fpwr);
 			(void) putc('\n', fpwr);
+		}
+	}
 	(void) fclose(fp);
 	if (fchmod(s, 0644) == FAIL) {
 		(void) fclose(fpwr);
 		(void) remove(ftmp);
 		warnx("unable to change permissions of `%s' temp file", ftmp);
 		return -1;
 	if (fclose(fpwr) == EOF) {
-		(void) remove(ftmp);
+		remove(fname_tmp);
-		warnx("unable to close `%s' temp file", ftmp);
+		warnx("unable to close `%s' temp file", fname_tmp);
 		free(fname);
 		free(fname_tmp);
 		return -1;
+	}
 	/* Rename the temp file to the +VIEWS file */
-	if (rename(ftmp, fname) == -1) {
+	if ((rv = rename(fname_tmp, fname)) == -1)
-		(void) remove(ftmp);
+		warnx("unable to rename `%s' to `%s'", fname_tmp, fname);
 		warnx("unable to rename `%s' to `%s'", ftmp, fname);
-		return -1;
+	remove(fname_tmp);
 	free(fname);
-	return 0;
+	free(fname_tmp);
 	return rv;
+}
 /*
  * Delete from directory 'home' all packages on lpkg_list.
  * If tryall is set, ignore errors from pkg_delete(1).
  */
 static int
 require_delete(int tryall)
+{
 	char *best_installed;
 	lpkg_t *lpp;
 	int     rv, fail;

 @@ -1,14 +1,14 @@
-/* $NetBSD: lib.h,v 1.42.2.11 2008/08/05 19:01:27 joerg Exp $ */
+/* $NetBSD: lib.h,v 1.42.2.12 2008/08/05 19:09:35 joerg Exp $ */
 /* from FreeBSD Id: lib.h,v 1.25 1997/10/08 07:48:03 charnier Exp */
 /*
  * 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
 @@ -112,26 +112,27 @@ enum {
 #define INSTALL_FNAME		"+INSTALL"
 #define DEINSTALL_FNAME		"+DEINSTALL"
 #define REQUIRED_BY_FNAME	"+REQUIRED_BY"
 #define REQUIRED_BY_FNAME_TMP	"+REQUIRED_BY.tmp"
 #define DISPLAY_FNAME		"+DISPLAY"
 #define MTREE_FNAME		"+MTREE_DIRS"
 #define BUILD_VERSION_FNAME	"+BUILD_VERSION"
 #define BUILD_INFO_FNAME	"+BUILD_INFO"
 #define INSTALLED_INFO_FNAME	"+INSTALLED_INFO"
 #define SIZE_PKG_FNAME		"+SIZE_PKG"
 #define SIZE_ALL_FNAME		"+SIZE_ALL"
 #define PRESERVE_FNAME		"+PRESERVE"
 #define VIEWS_FNAME		"+VIEWS"
 #define VIEWS_FNAME_TMP		"+VIEWS.tmp"
 #define DEPOT_FNAME		"+DEPOT"
 /* The names of special variables */
 #define AUTOMATIC_VARNAME	"automatic"
 /* Prefix for extended PLIST cmd */
 #define CMD_CHAR		'@'
 /* The name of the "prefix" environment variable given to scripts */
 #define PKG_PREFIX_VNAME	"PKG_PREFIX"
 /* The name of the "destdir" environment variable given to scripts */
 #define PKG_DESTDIR_VNAME	"PKG_DESTDIR"