cc5b1b5 Redo part of 54d9a45cc6d — HardenedBSD-pkg

modified pkg/add.c

@@ -52,7 +52,6 @@ exec_add(int argc, char **argv)

 	}
 	if (pkgdb_open(&db, PKGDB_DEFAULT) != EPKG_OK) {
 		pkg_error_warn("can not open database");
 		return (EX_IOERR);
 	}

modified pkg/autoremove.c

@@ -62,12 +62,10 @@ exec_autoremove(int argc, char **argv)

 	}
 	if (pkgdb_open(&db, PKGDB_DEFAULT) != EPKG_OK) {
 		pkg_error_warn("can not open database");
 		return (EX_IOERR);
 	}
 	if ((it = pkgdb_query_autoremove(db)) == NULL) {
 		pkg_error_warn("can not query database");
 		retcode = EPKG_FATAL;
 		goto cleanup;
 	}

@@ -103,7 +101,6 @@ exec_autoremove(int argc, char **argv)

 	}
 	if (pkgdb_compact(db) != EPKG_OK) {
 		pkg_error_warn("can not compact database");
 		retcode = EPKG_FATAL;
 	}

modified pkg/backup.c

@@ -25,7 +25,6 @@ exec_backup(int argc, char **argv)

 		dest = argv[2];
 	if (pkgdb_open(&db, PKGDB_DEFAULT) != EPKG_OK) {
 		pkg_error_warn("can not open database");
 		return (EX_IOERR);
 	}

modified pkg/info.c

@@ -173,7 +173,6 @@ exec_info(int argc, char **argv)

 	}
 	if (pkgdb_open(&db, PKGDB_DEFAULT) != EPKG_OK) {
 		pkg_error_warn("can not open database");
 		return (EX_IOERR);
 	}

@@ -239,7 +238,6 @@ exec_info(int argc, char **argv)

 		}
 		if ((it = pkgdb_query(db, pkgname, match)) == NULL) {
 			pkg_error_warn("can not query database");
 			return (EX_IOERR);
 		}

modified pkg/install.c

@@ -39,7 +39,6 @@ exec_install(int argc, char **argv)

 	}
 	if (pkgdb_open(&db, PKGDB_REMOTE) != EPKG_OK) {
 		pkg_error_warn("can not open database");
 		return (EX_IOERR);
 	}

modified pkg/register.c

@@ -109,11 +109,6 @@ exec_register(int argc, char **argv)

 		}
 	}
 	if (ret != 0) {
 		pkg_error_warn("can not parse arguments");
 		return (EX_USAGE);
 	}
 	if (plist == NULL)
 		errx(EX_USAGE, "missing -f flag");

@@ -130,7 +125,6 @@ exec_register(int argc, char **argv)

 	snprintf(fpath, MAXPATHLEN, "%s/+MANIFEST", mdir);
 	if ((ret = pkg_load_manifest_file(pkg, fpath)) != EPKG_OK) {
 		pkg_error_warn("can not parse manifest %s", fpath);
 		return (EX_IOERR);
 	}

@@ -181,7 +175,6 @@ exec_register(int argc, char **argv)

 	ret += ports_parse_plist(pkg, plist);
 	if (ret != EPKG_OK) {
 		pkg_error_warn("can not parse plist file");
 		return (EX_IOERR);
 	}

@@ -189,7 +182,6 @@ exec_register(int argc, char **argv)

 		free(plist);
 	if (pkgdb_open(&db, PKGDB_DEFAULT) != EPKG_OK) {
 		pkg_error_warn("can not open database");
 		return (EX_IOERR);
 	}

@@ -202,13 +194,11 @@ exec_register(int argc, char **argv)

 	}
 	if (pkgdb_register_pkg(db, pkg) != EPKG_OK) {
 		pkg_error_warn("can not register package");
 		retcode = EPKG_FATAL;
 	}
 	pkgdb_register_finale(db, ret);
 	if (ret != EPKG_OK) {
 		pkg_error_warn("can not register package");
 		retcode = EPKG_FATAL;
 	}

modified pkg/repo.c

@@ -76,7 +76,7 @@ exec_repo(int argc, char **argv)

 	retcode = pkg_create_repo(argv[1], progress, &pos);
 	if (retcode != EPKG_OK)
 		pkg_error_warn("can not create repository");
 		printf("can not create repository");
 	else
 		printf("\bDone!\n");

modified pkg/update.c

@@ -62,7 +62,6 @@ exec_update(int argc, char **argv)

 	tmp = mktemp(strdup("/tmp/repo.txz.XXXXXX"));
 	if (pkg_fetch_file(url, tmp) != EPKG_OK) {
 		pkg_error_warn("can not fetch %s", url);
 		retcode = EPKG_FATAL;
 		goto cleanup;
 	}

modified pkg/upgrade.c

@@ -44,12 +44,10 @@ exec_upgrade(int argc, char **argv)

 	}
 	if (pkgdb_open(&db, PKGDB_REMOTE) != EPKG_OK) {
 		pkg_error_warn("can not open database");
 		return (EX_IOERR);
 	}
 	if ((it = pkgdb_query_upgrades(db)) == NULL) {
 		pkg_error_warn("can not query database");
 		retcode = EPKG_FATAL;
 		goto cleanup;
 	}

@@ -65,7 +63,6 @@ exec_upgrade(int argc, char **argv)

 	pkgdb_it_free(it);
 	if ((it = pkgdb_query_downgrades(db)) == NULL) {
 		pkg_error_warn("can not query database");
 		retcode = EPKG_FATAL;
 		goto cleanup;
 	}

modified pkg/which.c

@@ -42,7 +42,6 @@ exec_which(int argc, char **argv)

 	snprintf(pathabs, sizeof(pathabs), "%s/%s", pathabsdir, basename(argv[1]));
 	if ((it = pkgdb_query_which(db, pathabs)) == NULL) {
 		pkg_error_warn("can not query database");
 		return (EX_IOERR);
 	}

@@ -51,7 +50,6 @@ exec_which(int argc, char **argv)

 		printf("%s was installed by package %s-%s\n", pathabs, pkg_get(pkg, PKG_NAME),
 			   pkg_get(pkg, PKG_VERSION));
 	} else if (ret != EPKG_END) {
 		pkg_error_warn("can not iterate over results");
 		retcode = EPKG_WARN;
 	} else {
 		printf("%s was not found in the database\n", pathabs);

modified pkg2legacy/pkg2legacy.c

@@ -96,7 +96,6 @@ main(int argc, char **argv)

 			continue;
 		if (pkg_open(&pkg, p->fts_accpath) != EPKG_OK) {
 			pkg_error_warn("Unable to open package %s (ignoring)", p->fts_accpath);
 			continue;
 		}