42430db Mimic pkg_delete default: if one of the pkg delete args contains * then switch to MATCH_GLOB — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Mimic pkg_delete default: if one of the pkg delete args contains * then switch to MATCH_GLOB

Baptiste Daroussin committed 13 years ago

commit 42430dbc56b56825a5e0bf6695a7f63bbd78d111
parent 28ee589

1 file changed +10 -0

modified pkg/delete.c

@@ -58,6 +58,7 @@ exec_delete(int argc, char **argv)

 	int retcode = EX_SOFTWARE;
 	nbactions = nbdone = 0;
 	pkg_flags f = PKG_FLAG_NONE;
 	int i;
 	pkg_config_bool(PKG_CONFIG_ASSUME_ALWAYS_YES, &yes);

@@ -119,6 +120,15 @@ exec_delete(int argc, char **argv)

 	pkg_jobs_set_flags(jobs, f);
 	if (match == MATCH_EXACT) {
 		for (i = 0; i < argc; i++) {
 			if (strchr(argv[i], '*') != NULL) {
 				match = MATCH_GLOB;
 				break;
 			}
 		}
 	}
 	if (pkg_jobs_add(jobs, match, argv, argc) == EPKG_FATAL)
 		goto cleanup;