From 1e7abc593d55bc436ccd98f6815d49b13511baa1 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 25 Aug 2008 22:39:17 -0700 Subject: Revert "Build-in "git-shell"" This reverts commit daa0cc9a92c9c2c714aa5f7da6d0ff65b93e0698. It was a stupid idea to do this; when run as a log-in shell, it is spawned with argv[0] set to "-git-shell", so the usual name-based dispatch would not work to begin with. --- Makefile | 2 +- builtin-shell.c | 90 --------------------------------------------------------- builtin.h | 1 - git.c | 1 - shell.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 90 insertions(+), 93 deletions(-) delete mode 100644 builtin-shell.c create mode 100644 shell.c diff --git a/Makefile b/Makefile index 7c585e866c..71339e1098 100644 --- a/Makefile +++ b/Makefile @@ -546,7 +546,6 @@ BUILTIN_OBJS += builtin-rev-parse.o BUILTIN_OBJS += builtin-revert.o BUILTIN_OBJS += builtin-rm.o BUILTIN_OBJS += builtin-send-pack.o -BUILTIN_OBJS += builtin-shell.o BUILTIN_OBJS += builtin-shortlog.o BUILTIN_OBJS += builtin-show-branch.o BUILTIN_OBJS += builtin-show-ref.o @@ -822,6 +821,7 @@ EXTLIBS += -lz ifndef NO_POSIX_ONLY_PROGRAMS PROGRAMS += git-daemon$X PROGRAMS += git-imap-send$X + PROGRAMS += git-shell$X endif ifndef NO_OPENSSL OPENSSL_LIBSSL = -lssl diff --git a/builtin-shell.c b/builtin-shell.c deleted file mode 100644 index 3cf97d4f5d..0000000000 --- a/builtin-shell.c +++ /dev/null @@ -1,90 +0,0 @@ -#include "cache.h" -#include "quote.h" -#include "exec_cmd.h" -#include "strbuf.h" -#include "builtin.h" - -static int do_generic_cmd(const char *me, char *arg) -{ - const char *my_argv[4]; - - setup_path(); - if (!arg || !(arg = sq_dequote(arg))) - die("bad argument"); - if (prefixcmp(me, "git-")) - die("bad command"); - - my_argv[0] = me + 4; - my_argv[1] = arg; - my_argv[2] = NULL; - - return execv_git_cmd(my_argv); -} - -static int do_cvs_cmd(const char *me, char *arg) -{ - const char *cvsserver_argv[3] = { - "cvsserver", "server", NULL - }; - - if (!arg || strcmp(arg, "server")) - die("git-cvsserver only handles server: %s", arg); - - setup_path(); - return execv_git_cmd(cvsserver_argv); -} - - -static struct commands { - const char *name; - int (*exec)(const char *me, char *arg); -} cmd_list[] = { - { "git-receive-pack", do_generic_cmd }, - { "git-upload-pack", do_generic_cmd }, - { "cvs", do_cvs_cmd }, - { NULL }, -}; - -int cmd_shell(int argc, const char **argv, const char *prefix) -{ - char *prog; - struct commands *cmd; - - /* - * Special hack to pretend to be a CVS server - */ - if (argc == 2 && !strcmp(argv[1], "cvs server")) - argv--; - - /* - * We do not accept anything but "-c" followed by "cmd arg", - * where "cmd" is a very limited subset of git commands. - */ - else if (argc != 3 || strcmp(argv[1], "-c")) - die("What do you think I am? A shell?"); - - prog = xstrdup(argv[2]); - if (!strncmp(prog, "git", 3) && isspace(prog[3])) - /* Accept "git foo" as if the caller said "git-foo". */ - prog[3] = '-'; - - for (cmd = cmd_list ; cmd->name ; cmd++) { - int len = strlen(cmd->name); - char *arg; - if (strncmp(cmd->name, prog, len)) - continue; - arg = NULL; - switch (prog[len]) { - case '\0': - arg = NULL; - break; - case ' ': - arg = prog + len + 1; - break; - default: - continue; - } - exit(cmd->exec(cmd->name, arg)); - } - die("unrecognized command '%s'", prog); -} diff --git a/builtin.h b/builtin.h index 2b57a5eb6b..f3502d305e 100644 --- a/builtin.h +++ b/builtin.h @@ -88,7 +88,6 @@ extern int cmd_rev_parse(int argc, const char **argv, const char *prefix); extern int cmd_revert(int argc, const char **argv, const char *prefix); extern int cmd_rm(int argc, const char **argv, const char *prefix); extern int cmd_send_pack(int argc, const char **argv, const char *prefix); -extern int cmd_shell(int argc, const char **argv, const char *prefix); extern int cmd_shortlog(int argc, const char **argv, const char *prefix); extern int cmd_show(int argc, const char **argv, const char *prefix); extern int cmd_show_branch(int argc, const char **argv, const char *prefix); diff --git a/git.c b/git.c index 89e4645736..37b1d76a08 100644 --- a/git.c +++ b/git.c @@ -338,7 +338,6 @@ static void handle_internal_command(int argc, const char **argv) { "revert", cmd_revert, RUN_SETUP | NEED_WORK_TREE }, { "rm", cmd_rm, RUN_SETUP }, { "send-pack", cmd_send_pack, RUN_SETUP }, - { "shell", cmd_shell }, { "shortlog", cmd_shortlog, USE_PAGER }, { "show-branch", cmd_show_branch, RUN_SETUP }, { "show", cmd_show, RUN_SETUP | USE_PAGER }, diff --git a/shell.c b/shell.c new file mode 100644 index 0000000000..0f6a727a8c --- /dev/null +++ b/shell.c @@ -0,0 +1,89 @@ +#include "cache.h" +#include "quote.h" +#include "exec_cmd.h" +#include "strbuf.h" + +static int do_generic_cmd(const char *me, char *arg) +{ + const char *my_argv[4]; + + setup_path(); + if (!arg || !(arg = sq_dequote(arg))) + die("bad argument"); + if (prefixcmp(me, "git-")) + die("bad command"); + + my_argv[0] = me + 4; + my_argv[1] = arg; + my_argv[2] = NULL; + + return execv_git_cmd(my_argv); +} + +static int do_cvs_cmd(const char *me, char *arg) +{ + const char *cvsserver_argv[3] = { + "cvsserver", "server", NULL + }; + + if (!arg || strcmp(arg, "server")) + die("git-cvsserver only handles server: %s", arg); + + setup_path(); + return execv_git_cmd(cvsserver_argv); +} + + +static struct commands { + const char *name; + int (*exec)(const char *me, char *arg); +} cmd_list[] = { + { "git-receive-pack", do_generic_cmd }, + { "git-upload-pack", do_generic_cmd }, + { "cvs", do_cvs_cmd }, + { NULL }, +}; + +int main(int argc, char **argv) +{ + char *prog; + struct commands *cmd; + + /* + * Special hack to pretend to be a CVS server + */ + if (argc == 2 && !strcmp(argv[1], "cvs server")) + argv--; + + /* + * We do not accept anything but "-c" followed by "cmd arg", + * where "cmd" is a very limited subset of git commands. + */ + else if (argc != 3 || strcmp(argv[1], "-c")) + die("What do you think I am? A shell?"); + + prog = argv[2]; + if (!strncmp(prog, "git", 3) && isspace(prog[3])) + /* Accept "git foo" as if the caller said "git-foo". */ + prog[3] = '-'; + + for (cmd = cmd_list ; cmd->name ; cmd++) { + int len = strlen(cmd->name); + char *arg; + if (strncmp(cmd->name, prog, len)) + continue; + arg = NULL; + switch (prog[len]) { + case '\0': + arg = NULL; + break; + case ' ': + arg = prog + len + 1; + break; + default: + continue; + } + exit(cmd->exec(cmd->name, arg)); + } + die("unrecognized command '%s'", prog); +} -- cgit v1.2.3