e67b79e vec: use vec_foreach — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

vec: use vec_foreach

Baptiste Daroussin committed 1 year ago

commit e67b79e040b8a8d7cc5524d499539d318e4ff6b6
parent 0ffde04

4 files changed +12 -12

modified libpkg/pkg_add.c

@@ -418,7 +418,7 @@ get_tempdir(struct pkg_add_context *context, const char *path, tempdirs_t *tempd

 {
 	struct tempdir *tmpdir = NULL;
 	for (size_t i = 0; i < tempdirs->len; i++) {
 	vec_foreach(*tempdirs, i) {
 		tmpdir = tempdirs->d[i];
 		if (strncmp(tmpdir->name, path, tmpdir->len) == 0 && path[tmpdir->len] == '/') {
 			reopen_tempdir(context->rootfd, tmpdir);

@@ -641,7 +641,7 @@ create_hardlink(struct pkg_add_context *context, struct pkg_file *f, const char

 		return (EPKG_FATAL);
 	}
 	if (fh->temppath[0] == '\0') {
 		for (size_t i = 0; i < tempdirs->len; i++) {
 		vec_foreach(*tempdirs, i) {
 			if (strncmp(tempdirs->d[i]->name, fh->path, tempdirs->d[i]->len) == 0 &&
 			    fh->path[tempdirs->d[i]->len] == '/' ) {
 				tmphdir = tempdirs->d[i];

@@ -1006,7 +1006,7 @@ pkg_extract_finalize(struct pkg *pkg, tempdirs_t *tempdirs)

 	if (tempdirs != NULL) {
 		for (size_t i = 0; i < tempdirs->len; i++) {
 		vec_foreach(*tempdirs, i) {
 			struct tempdir *t = tempdirs->d[i];
 			if (renameat(pkg->rootfd, RELATIVE_PATH(t->temp),
 			    pkg->rootfd, RELATIVE_PATH(t->name)) != 0) {

@@ -1086,7 +1086,7 @@ static bool

 should_append_pkg(pkgs_t *localpkgs, struct pkg *p)
 {
 	/* only keep the highest version is we fine one */
 	for (size_t i = 0; i < localpkgs->len; i++) {
 	vec_foreach(*localpkgs, i) {
 		struct pkg *lp = localpkgs->d[i];
 		if (strcmp(lp->name, p->name) == 0) {
 			if (pkg_version_cmp(lp->version, p->version) == -1) {

@@ -1130,7 +1130,7 @@ scan_local_pkgs(struct pkg_add_db *db, bool fromstdin, struct localhashes *l, co

 			globfree(&g);
 			free(pattern);
 		}
 		for (size_t i = 0; i < db->localpkgs.len; i++) {
 		vec_foreach(db->localpkgs, i) {
 			struct pkg *p = db->localpkgs.d[i];
 			tll_foreach(p->shlibs_provided, sp) {
 				pkghash_safe_add(l->shlibs_provides, sp->item, xstrdup(p->repopath), free);

@@ -1145,7 +1145,7 @@ scan_local_pkgs(struct pkg_add_db *db, bool fromstdin, struct localhashes *l, co

 static const char *
 _localpkgs_get(pkgs_t *pkgs, const char *name)
 {
 	for (size_t i = 0; i < pkgs->len; i++) {
 	vec_foreach(*pkgs, i) {
 		if (STREQ(pkgs->d[i]->name, name))
 			return (pkgs->d[i]->repopath);
 	}

@@ -1933,7 +1933,7 @@ pkg_add_fromdir(struct pkg *pkg, const char *src, struct pkgdb *db __unused)

 				    " '%s'", RELATIVE_PATH(f->path));
 			}
 			path = NULL;
 			for (size_t i = 0; i < hardlinks.len; i++) {
 			vec_foreach(hardlinks, i) {
 				struct hardlink *hit = hardlinks.d[i];
 				if (hit->ino == st.st_ino &&
 				    hit->dev == st.st_dev) {

modified libpkg/utils.c

@@ -392,7 +392,7 @@ check_for_hardlink(hardlinks_t *hl, struct stat *st)

 {
 	struct hardlink *h;
 	for (size_t i = 0; i < hl->len; i++) {
 	vec_foreach(*hl, i) {
 		h = hl->d[i];
 		if (h->ino == st->st_ino &&
 		    h->dev == st->st_dev)

@@ -1076,7 +1076,7 @@ get_http_auth(void)

 bool
 c_charv_contains(c_charv_t *v, const char *el, bool casesensitive)
 {
 	for (size_t i = 0; i < v->len; i ++) {
 	vec_foreach(*v, i) {
 		if (casesensitive) {
 			if (STREQ(v->d[i], el))
 				return (true);

modified src/main.c

@@ -304,7 +304,7 @@ show_version_info(int version)

 	printf("%-24s: %s\n", "libpkg", pkg_libversion());
 	pkg_kvl_t *lib = pkg_external_libs_version();
 	for (size_t i = 0; i < lib->len; i++) {
 	vec_foreach(*lib, i) {
 		printf("%-24s: %s\n", lib->d[i]->key, lib->d[i]->value);
 	}
 	free(lib);

modified src/update.c

@@ -44,7 +44,7 @@

 static bool
 _find_repo(c_charv_t *reponames, const char *name)
 {
 	for (size_t i = 0; i < reponames->len; i++) {
 	vec_foreach(*reponames, i) {
 		if (STREQ(name, reponames->d[i]))
 			return (true);
 	}

@@ -113,7 +113,7 @@ pkgcli_update(bool force, bool strict, c_charv_t *reponames)

 			if (reponames == NULL || reponames->len == 0)
 				printf("All repositories are up to date.\n");
 			else {
 				for (size_t i = 0; i < reponames->len; i++)
 				vec_foreach(*reponames, i)
 					printf("%s%s", i == 0 ? "" : ", ", reponames->d[i]);
 				printf(" %s up to date.\n", reponames->len == 1 ? "is" : "are");
 			}