adb1762 make pkg help use the generic usage command — HardenedBSD-pkg

HardenedBSD Package Manager

make pkg help use the generic usage command

Baptiste Daroussin committed 13 years ago

commit adb1762ba62f4bc37d8a3adc307f082827fab843
parent 709ce4a0ac80a78d52a6f1141a039aba2deeb38e

3 files changed +11 -6

modified libpkg/pkg.h

@@ -1052,6 +1052,7 @@ typedef int(*pkg_event_cb)(void *, struct pkg_event *);

 void pkg_event_register(pkg_event_cb cb, void *data);
 int pkg_init(const char *);
 int pkg_initialized(void);
 int pkg_shutdown(void);
 void pkg_test_filesum(struct pkg *);

modified libpkg/pkg_config.c

@@ -302,6 +302,12 @@ subst_packagesite(void)

 }
 int
 pkg_initialized(void)
 {
 	return (parsed);
 }
 int
 pkg_config_string(pkg_config_key key, const char **val)
 {
 	*val = NULL;

modified pkg/main.c

@@ -108,7 +108,7 @@ usage(void)

 	for (unsigned int i = 0; i < cmd_len; i++)
 		fprintf(stderr, "\t%-15s%s\n", cmd[i].name, cmd[i].desc);
 	if (pkg_init(NULL) != EPKG_OK)
 	if (!pkg_initialized() && pkg_init(NULL) != EPKG_OK)
 		errx(EX_SOFTWARE, "Cannot parse configuration file!");
 	pkg_config_bool(PKG_CONFIG_ENABLE_PLUGINS, &plugins_enabled);

@@ -129,17 +129,15 @@ usage(void)

 	fprintf(stderr, "\nFor more information on the different commands"
 			" see 'pkg help <command>'.\n");
 	pkg_shutdown();
 	exit(EX_USAGE);
 }
 static void
 usage_help(void)
 {
 	fprintf(stderr, "usage: pkg help <command>\n\n");
 	fprintf(stderr, "Where <command> can be:\n");
 	for (unsigned int i = 0; i < cmd_len; i++)
 		fprintf(stderr, "\t%s\n", cmd[i].name);
 	usage();
 }
 static int