0844626 Prepend pass for default REPOS_DIR with pkg_rootdir if needed Fix reading the default config reading based on rootdir — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Prepend pass for default REPOS_DIR with pkg_rootdir if needed Fix reading the default config reading based on rootdir

Baptiste Daroussin committed 10 years ago

commit 0844626d7059b33cd092fa9b56f29df8cafca00a
parent 2305d4e

1 file changed +16 -6

modified libpkg/pkg_config.c

@@ -828,6 +828,7 @@ pkg_ini(const char *path, const char *reposdir, pkg_init_flags flags)

 	bool fatal_errors = false;
 	int conffd = -1;
 	char *tmp = NULL;
 	const char *default_path = PREFIX"/etc/pkg.conf" + 1;
 	k = NULL;
 	o = NULL;

@@ -914,13 +915,24 @@ pkg_ini(const char *path, const char *reposdir, pkg_init_flags flags)

 			if (c[i].def != NULL) {
 				walk = buf = c[i].def;
 				while ((buf = strchr(buf, ',')) != NULL) {
 					tmp = NULL;
 					if (*walk == '/' && pkg_rootdir != NULL) {
 						asprintf(&tmp, "%s%.*s", pkg_rootdir, (int)(buf - walk), walk);
 					}
 					ucl_array_append(obj,
 					    ucl_object_fromstring_common(walk, buf - walk, UCL_STRING_TRIM));
 					    ucl_object_fromstring_common(tmp != NULL ? tmp : walk,
 						    tmp != NULL ? 0 : buf - walk, UCL_STRING_TRIM));
 					buf++;
 					walk = buf;
 					free(tmp);
 				}
 				tmp = NULL;
 				if (*walk == '/' && pkg_rootdir != NULL) {
 					asprintf(&tmp, "%s%s", pkg_rootdir, walk);
 				}
 				ucl_array_append(obj,
 				    ucl_object_fromstring_common(walk, strlen(walk), UCL_STRING_TRIM));
 				    ucl_object_fromstring_common(tmp, 0, UCL_STRING_TRIM));
 				free(tmp);
 			}
 			ucl_object_insert_key(config, obj,
 			    c[i].key, strlen(c[i].key), false);

@@ -928,10 +940,8 @@ pkg_ini(const char *path, const char *reposdir, pkg_init_flags flags)

 		}
 	}
 	if (path == NULL)
 		path = PREFIX"/etc/pkg.conf" + 1;
 	conffd = openat(rootfd, path, O_RDONLY);
 	conffd = openat(path == NULL ? rootfd : AT_FDCWD,
 	    path == NULL ? default_path : path, O_RDONLY);
 	if (conffd == -1 && errno != ENOENT) {
 		pkg_emit_error("Cannot open %s/%s: %s",
 		    pkg_rootdir != NULL ? pkg_rootdir : "",