3ecdcdb improve matching of arches (and reapply fnmatch in right order) — HardenedBSD-pkg

HardenedBSD Package Manager

improve matching of arches (and reapply fnmatch in right order)

Baptiste Daroussin committed 13 years ago

commit 3ecdcdb22d29be813fef6acf6947b4655bc25674
parent 42a9122beec28eace435b78824aadeca589d1093

1 file changed +1 -1

modified libpkg/pkg_add.c

@@ -167,7 +167,7 @@ pkg_add(struct pkgdb *db, const char *path, int flags)

 	pkg_config_string(PKG_CONFIG_ABI, &myarch);
 	pkg_get(pkg, PKG_ARCH, &arch, PKG_ORIGIN, &origin);
 	if (fnmatch(arch, myarch, FNM_CASEFOLD) == FNM_NOMATCH) {
 	if (fnmatch(myarch, arch, FNM_CASEFOLD) == FNM_NOMATCH && strncmp(arch, myarch, strlen(myarch)) != 0) {
 		pkg_emit_error("wrong architecture: %s instead of %s",
 		    arch, myarch);
 		if ((flags & PKG_ADD_FORCE) == 0) {