4346466 Report the number of plugins loaded by pkg at startup — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Report the number of plugins loaded by pkg at startup

Marin Atanasov Nikolov committed 13 years ago

commit 4346466b30def9f3421d38d9b3be1cbab69ebf2f
parent 231d9e8

1 file changed +4 -2

modified libpkg/plugins.c

@@ -234,8 +234,8 @@ pkg_plugins_load(struct pkg_plugins *p)

 	sbuf_printf(init_name, "pkg_plugins_init_%s", pluginname);
 	if ((init_func = dlsym(p->lh, sbuf_get(init_name))) == NULL) {
 		pkg_emit_error("Cannot load init function for plugin '%s': %s",
 			       pluginname, dlerror());
 		pkg_emit_error("Cannot load init function for plugin '%s'", pluginname);
 		pkg_emit_error("Plugin '%s' will not be loaded: %s", pluginname, dlerror());
 		sbuf_delete(init_name);
 		dlclose(p->lh);
 		return (EPKG_FATAL);

@@ -363,6 +363,8 @@ pkg_plugins_display_loaded(void)

 		if (pkg_plugins_is_loaded(p))
 			printf("%s ", pkg_plugins_get(p, PKG_PLUGINS_NAME));
 	printf("\nSuccessfully loaded %d plugins\n", have_plugins_loaded);
 	return (EPKG_OK);
 }