bdc8223 pkg_register_cmd_argv0 makes no sense directly creating a binary using libpkg is a better solution — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

pkg_register_cmd_argv0 makes no sense directly creating a binary using libpkg is a better solution

Baptiste Daroussin committed 12 years ago

commit bdc8223e0ffeba70d1abad4e9133ea4eae70c191
parent e69a3dc

1 file changed +0 -24

modified pkg/main.c

@@ -47,7 +47,6 @@

 #endif
 #include <pkg.h>
 #include <uthash.h>
 #include "pkgcli.h"

@@ -114,15 +113,8 @@ struct plugcmd {

 	STAILQ_ENTRY(plugcmd) next;
 };
 struct plugcmd0 {
 	const char *cmd;
 	int (*exec)(int argc, char **argv);
 	UT_hash_handle hh;
 };
 typedef int (register_cmd)(int idx, const char **name, const char **desc, int (**exec)(int argc, char **argv));
 typedef int (nb_cmd)(void);
 typedef int (register_cmd_argv0)(int idx, const char **name, int (**exec)(int argc, char **argv));
 static void
 show_command_names(void)

@@ -538,7 +530,6 @@ main(int argc, char **argv)

 	bool show_commands = false;
 	bool activation_test = false;
 	struct plugcmd *c;
 	struct plugcmd0 *argv0 = NULL, *c0;
 	const char *conffile = NULL;
 	const char *reposdir = NULL;
 	struct pkg_config_kv *alias = NULL;

@@ -671,17 +662,6 @@ main(int argc, char **argv)

 					STAILQ_INSERT_TAIL(&plugins, c, next);
 				}
 			}
 			ncmd = pkg_plugin_func(p, "pkg_register_cmd_argv0_count");
 			register_cmd_argv0 *reg0 = pkg_plugin_func(p, "pkg_register_cmd_argv0");
 			if (reg0 != NULL && ncmd != NULL) {
 				n = ncmd();
 				for (j = 0; j < n ; j++) {
 					c0 = malloc(sizeof(struct plugcmd0));
 					reg0(j, &c0->cmd, &c0->exec);
 					HASH_ADD_KEYPTR(hh, argv0, c0->cmd, strlen(c0->cmd), c0);
 				}
 			}
 		}
 	}

@@ -696,10 +676,6 @@ main(int argc, char **argv)

 		exit(EXIT_SUCCESS);
 	}
 	HASH_FIND_STR(argv0, getprogname(), c0);
 	if (c0 != NULL)
 		return (c0->exec(cmdargc, cmdargv));
 	newargv = argv;
 	newargc = argc;
 	len = strlen(argv[0]);