0689ba7 Repair api by introducing a new pkg_ini() and make pkg_init() call pkg_ini — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Repair api by introducing a new pkg_ini() and make pkg_init() call pkg_ini

Baptiste Daroussin committed 11 years ago

commit 0689ba7bbec8a757b63f5e5c45f128cc3f6865e7
parent 25fd606

4 files changed +11 -3

modified libpkg/libpkg.ver

@@ -79,6 +79,7 @@ global:

 	pkg_has_dir;
 	pkg_has_file;
 	pkg_has_message;
 	pkg_ini;
 	pkg_init;
 	pkg_initialized;
 	pkg_is_installed;

modified libpkg/pkg.h.in

@@ -1602,7 +1602,8 @@ typedef int(*pkg_event_cb)(void *, struct pkg_event *);

 void pkg_event_register(pkg_event_cb cb, void *data);
 bool pkg_compiled_for_same_os_major(void);
 int pkg_init(const char *, const char *, pkg_init_flags);
 int pkg_ini(const char *, const char *, pkg_init_flags);
 int pkg_init(const char *, const char *);
 int pkg_initialized(void);
 void pkg_shutdown(void);

modified libpkg/pkg_config.c

@@ -687,7 +687,13 @@ pkg_compiled_for_same_os_major(void)

 int
 pkg_init(const char *path, const char *reposdir, pkg_init_flags flags)
 pkg_init(const char *path, const char *reposdir)
 {
 	return (pkg_ini(path, reposdir, 0));
 }
 int
 pkg_ini(const char *path, const char *reposdir, pkg_init_flags flags)
 {
 	struct ucl_parser *p = NULL;
 	size_t i;

modified src/main.c

@@ -188,7 +188,7 @@ usage(const char *conffile, const char *reposdir, FILE *out, enum pkg_usage_reas

 		for (i = 0; i < cmd_len; i++)
 			fprintf(out, "\t%-15s%s\n", cmd[i].name, cmd[i].desc);
 		if (!pkg_initialized() && pkg_init(conffile, reposdir, 0) != EPKG_OK)
 		if (!pkg_initialized() && pkg_ini(conffile, reposdir, 0) != EPKG_OK)
 			errx(EX_SOFTWARE, "Cannot parse configuration file!");
 		plugins_enabled = pkg_object_bool(pkg_config_get("PKG_ENABLE_PLUGINS"));