c309816 Merge pull request #436 from smortex/plugins-help — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Merge pull request #436 from smortex/plugins-help

Baptiste Daroussin committed 13 years ago

commit c309816c84132c7428db8b068ed48ad5f6540115
parent e84520c

1 file changed +18 -0

modified pkg/main.c

@@ -178,6 +178,8 @@ static int

 exec_help(int argc, char **argv)
 {
 	char *manpage;
 	bool plugins_enabled = false;
 	struct plugcmd *c;
 	if ((argc != 2) || (strcmp("help", argv[1]) == 0)) {
 		usage_help();

@@ -196,6 +198,22 @@ exec_help(int argc, char **argv)

 		}
 	}
 	pkg_config_bool(PKG_CONFIG_ENABLE_PLUGINS, &plugins_enabled);
 	if (plugins_enabled) {
 		STAILQ_FOREACH(c, &plugins, next) {
 			if (strcmp(c->name, argv[1]) == 0) {
 				if (asprintf(&manpage, "/usr/bin/man pkg-%s", c->name) == -1)
 					errx(1, "cannot allocate memory");
 				system(manpage);
 				free(manpage);
 				return (0);
 			}
 		}
 	}
 	if (strcmp(argv[1], "pkg") == 0) {
 		system("/usr/bin/man 8 pkg");
 		return (0);