undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up internal command handling

Browse Source 
This should change no code at all, it just moves the definition of "struct
cmd_struct" out, and then splits out the running of the right command into
the "run_command()" function.

It also removes the long-unused 'envp' pointer passing.

This is just preparation for adding some more error checking.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Linus Torvalds 2007-06-24 10:10:40 -07:00 committed by Junio C Hamano
parent aeb5932845
commit 47d0b4ff57
1 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
git.c
View File

@ -216,14 +216,34 @@ const char git_version_string[] = GIT_VERSION;
*/ */
#define NOT_BARE (1<<2) #define NOT_BARE (1<<2)
static void handle_internal_command(int argc, const char **argv, char **envp) struct cmd_struct {
const char *cmd;
int (*fn)(int, const char **, const char *);
int option;
};
static int run_command(struct cmd_struct *p, int argc, const char **argv)
{
const char *prefix;
prefix = NULL;
if (p->option & RUN_SETUP)
prefix = setup_git_directory();
if (p->option & USE_PAGER)
setup_pager();
if (p->option & NOT_BARE) {
if (is_bare_repository() || is_inside_git_dir())
die("%s must be run in a work tree", p->cmd);
}
trace_argv_printf(argv, argc, "trace: built-in: git");
return p->fn(argc, argv, prefix);
}
static void handle_internal_command(int argc, const char **argv)
{ {
const char *cmd = argv[0]; const char *cmd = argv[0];
static struct cmd_struct { static struct cmd_struct commands[] = {
const char *cmd;
int (*fn)(int, const char **, const char *);
int option;
} commands[] = {
{ "add", cmd_add, RUN_SETUP | NOT_BARE }, { "add", cmd_add, RUN_SETUP | NOT_BARE },
{ "annotate", cmd_annotate, RUN_SETUP | USE_PAGER }, { "annotate", cmd_annotate, RUN_SETUP | USE_PAGER },
{ "apply", cmd_apply }, { "apply", cmd_apply },
@ -307,25 +327,13 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
for (i = 0; i < ARRAY_SIZE(commands); i++) { for (i = 0; i < ARRAY_SIZE(commands); i++) {
struct cmd_struct *p = commands+i; struct cmd_struct *p = commands+i;
const char *prefix;
if (strcmp(p->cmd, cmd)) if (strcmp(p->cmd, cmd))
continue; continue;
exit(run_command(p, argc, argv));
prefix = NULL;
if (p->option & RUN_SETUP)
prefix = setup_git_directory();
if (p->option & USE_PAGER)
setup_pager();
if ((p->option & NOT_BARE) &&
(is_bare_repository() || is_inside_git_dir()))
die("%s must be run in a work tree", cmd);
trace_argv_printf(argv, argc, "trace: built-in: git");
exit(p->fn(argc, argv, prefix));
} }
} }
int main(int argc, const char **argv, char **envp) int main(int argc, const char **argv)
{ {
const char *cmd = argv[0] ? argv[0] : "git-help"; const char *cmd = argv[0] ? argv[0] : "git-help";
char *slash = strrchr(cmd, '/'); char *slash = strrchr(cmd, '/');
@ -358,7 +366,7 @@ int main(int argc, const char **argv, char **envp)
if (!prefixcmp(cmd, "git-")) { if (!prefixcmp(cmd, "git-")) {
cmd += 4; cmd += 4;
argv[0] = cmd; argv[0] = cmd;
handle_internal_command(argc, argv, envp); handle_internal_command(argc, argv);
die("cannot handle %s internally", cmd); die("cannot handle %s internally", cmd);
} }
@ -390,7 +398,7 @@ int main(int argc, const char **argv, char **envp)
while (1) { while (1) {
/* See if it's an internal command */ /* See if it's an internal command */
handle_internal_command(argc, argv, envp); handle_internal_command(argc, argv);
/* .. then try the external ones */ /* .. then try the external ones */
execv_git_cmd(argv); execv_git_cmd(argv);