Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 41519b7
pkg_config: use global struct os_info
Baptiste Daroussin committed 1 year ago
commit 41519b7aaa6f084c028647db00a915a831f3bf10
parent fa0f9ff
1 file changed +19 -19
modified libpkg/pkg_config.c
@@ -871,7 +871,7 @@ walk_repo_obj(const ucl_object_t *obj, const char *file, pkg_init_flags flags)


static void

load_repo_file(int dfd, const char *repodir, const char *repofile,
- 
    pkg_init_flags flags, struct os_info *oi)
+ 
    pkg_init_flags flags)

{

	struct ucl_parser *p;

	ucl_object_t *obj = NULL;
@@ -886,22 +886,22 @@ load_repo_file(int dfd, const char *repodir, const char *repofile,


	myarch_legacy = pkg_object_string(pkg_config_get("ALTABI"));

	ucl_parser_register_variable (p, "ALTABI", myarch_legacy);
- 
	if (oi->ostype == OS_FREEBSD)
- 
		ucl_parser_register_variable(p, "OSVERSION", oi->str_osversion);
- 
	if (oi->name != NULL) {
- 
		ucl_parser_register_variable(p, "OSNAME", oi->name);
+ 
	if (oi.ostype == OS_FREEBSD)
+ 
		ucl_parser_register_variable(p, "OSVERSION", oi.str_osversion);
+ 
	if (oi.name != NULL) {
+ 
		ucl_parser_register_variable(p, "OSNAME", oi.name);

	}
- 
	if (oi->version != NULL) {
- 
		ucl_parser_register_variable(p, "RELEASE", oi->version);
+ 
	if (oi.version != NULL) {
+ 
		ucl_parser_register_variable(p, "RELEASE", oi.version);

	}
- 
	if (oi->version_major != NULL) {
- 
		ucl_parser_register_variable(p, "VERSION_MAJOR", oi->version_major);
+ 
	if (oi.version_major != NULL) {
+ 
		ucl_parser_register_variable(p, "VERSION_MAJOR", oi.version_major);

	}
- 
	if (oi->version_minor != NULL) {
- 
		ucl_parser_register_variable(p, "VERSION_MINOR", oi->version_minor);
+ 
	if (oi.version_minor != NULL) {
+ 
		ucl_parser_register_variable(p, "VERSION_MINOR", oi.version_minor);

	}
- 
	if (oi->arch != NULL) {
- 
		ucl_parser_register_variable(p, "ARCH", oi->arch);
+ 
	if (oi.arch != NULL) {
+ 
		ucl_parser_register_variable(p, "ARCH", oi.arch);

	}



	errno = 0;
@@ -955,7 +955,7 @@ configfile(const struct dirent *dp)
}



static void
- 
load_repo_files(const char *repodir, pkg_init_flags flags, struct os_info *oi)
+ 
load_repo_files(const char *repodir, pkg_init_flags flags)

{

	struct dirent **ent;

	int nents, i, fd;
@@ -966,7 +966,7 @@ load_repo_files(const char *repodir, pkg_init_flags flags, struct os_info *oi)


	nents = scandir(repodir, &ent, configfile, alphasort);

	for (i = 0; i < nents; i++) {
- 
		load_repo_file(fd, repodir, ent[i]->d_name, flags, oi);
+ 
		load_repo_file(fd, repodir, ent[i]->d_name, flags);

		free(ent[i]);

	}

	if (nents >= 0)
@@ -975,19 +975,19 @@ load_repo_files(const char *repodir, pkg_init_flags flags, struct os_info *oi)
}



static void
- 
load_repositories(const char *repodir, pkg_init_flags flags, struct os_info *oi)
+ 
load_repositories(const char *repodir, pkg_init_flags flags)

{

	const pkg_object *reposlist, *cur;

	pkg_iter it = NULL;



	if (repodir != NULL) {
- 
		load_repo_files(repodir, flags, oi);
+ 
		load_repo_files(repodir, flags);

		return;

	}



	reposlist = pkg_config_get("REPOS_DIR");

	while ((cur = pkg_object_iterate(reposlist, &it)))
- 
		load_repo_files(pkg_object_string(cur), flags, oi);
+ 
		load_repo_files(pkg_object_string(cur), flags);

}



bool
@@ -1456,7 +1456,7 @@ pkg_ini(const char *path, const char *reposdir, pkg_init_flags flags)
		setenv("HTTP_USER_AGENT", "pkg/"PKGVERSION, 1);



	/* load the repositories */
- 
	load_repositories(reposdir, flags, &oi);
+ 
	load_repositories(reposdir, flags);



	object = ucl_object_find_key(config, "REPOSITORIES");

	while ((cur = ucl_iterate_object(object, &it, true))) {