Clean up internal command handling

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>

diff --git a/git.c b/git.c
index 29b55a16047837084fd9e2e8238137b8a2fe44ea..911fd3dabb7bca08365e9dd68a5b52bcb7bdbe6d 100644 (file)
--- a/git.c
+++ b/git.c
@@ -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 {
-               const char *cmd;
-               int (*fn)(int, const char **, const char *);
-               int option;
-       } commands[] = {
+       static struct cmd_struct commands[] = {

                { "add", cmd_add, RUN_SETUP | NOT_BARE },
                { "annotate", cmd_annotate, RUN_SETUP | USE_PAGER },
                { "apply", cmd_apply },
                { "add", cmd_add, RUN_SETUP | NOT_BARE },
                { "annotate", cmd_annotate, RUN_SETUP | USE_PAGER },
                { "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++) {
                struct cmd_struct *p = commands+i;
 
        for (i = 0; i < ARRAY_SIZE(commands); i++) {
                struct cmd_struct *p = commands+i;

-               const char *prefix;

                if (strcmp(p->cmd, cmd))
                        continue;
                if (strcmp(p->cmd, cmd))
                        continue;

-
-               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));
+               exit(run_command(p, argc, argv));

        }
 }
 
        }
 }
 

-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";
        char *slash = strrchr(cmd, '/');
 {
        const char *cmd = argv[0] ? argv[0] : "git-help";
        char *slash = strrchr(cmd, '/');


@@ -358,7 +366,7 @@ int main(int argc, const char **argv, char **envp)
        if (!prefixcmp(cmd, "git-")) {
                cmd += 4;
                argv[0] = cmd;
        if (!prefixcmp(cmd, "git-")) {
                cmd += 4;
                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) {
                /* See if it's an internal command */
 
        while (1) {
                /* See if it's an internal command */

-               handle_internal_command(argc, argv, envp);
+               handle_internal_command(argc, argv);

 
                /* .. then try the external ones */
                execv_git_cmd(argv);
 
                /* .. then try the external ones */
                execv_git_cmd(argv);