fb6b9d8 Correct checking pkg add is invoqued from stdin — HardenedBSD-pkg

HardenedBSD Package Manager

Correct checking pkg add is invoqued from stdin

Baptiste Daroussin committed 10 years ago

commit fb6b9d87b96df97f5879bb8a55726d8f7468a798
parent 7271818d680546a159c6d40708486c4cf32b5529

1 file changed +4 -2

modified libpkg/pkg_add.c

@@ -615,6 +615,7 @@ pkg_add_check_pkg_archive(struct pkgdb *db, struct pkg *pkg,

 	char	dpath[MAXPATHLEN], *ppath;
 	const char	*ext = NULL;
 	struct pkg	*pkg_inst = NULL;
 	bool	fromstdin;
 	arch = pkg->abi != NULL ? pkg->abi : pkg->arch;

@@ -651,8 +652,9 @@ pkg_add_check_pkg_archive(struct pkgdb *db, struct pkg *pkg,

 	 * reading from a file descriptor or a unix domain socket or
 	 * whatever, there's no valid directory to search.
 	 */
 	fromstdin = (strcmp(path, "-") == 0);
 	strlcpy(bd, path, sizeof(bd));
 	if (strncmp(path, "-", 2) != 0) {
 	if (!fromstdin) {
 		basedir = dirname(bd);
 		if ((ext = strrchr(path, '.')) == NULL) {
 			pkg_emit_error("%s has no extension", path);

@@ -667,7 +669,7 @@ pkg_add_check_pkg_archive(struct pkgdb *db, struct pkg *pkg,

 		if (pkg_is_installed(db, dep->name) == EPKG_OK)
 			continue;
 		if (basedir == NULL) {
 		if (fromstdin) {
 			pkg_emit_missing_dep(pkg, dep);
 			if ((flags & PKG_ADD_FORCE_MISSING) == 0)
 				goto cleanup;