git-shell: accept "git foo" form
This is a backport of 0a47dc110e042b5bcc63dc94c8d517e67efe9306 to 'maint' to be included in 1.5.6.2 so that older server side can accept dashless form of request when clients are updated. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Dec 1, 2007 at 22:16 UTC
bc7c73e29cfb38232b5b6b1d1e8d59e7145a9860
1 file changed
+13
-4
shell.c
+13
-4
@@ -7,6 +7,7 @@ static int do_generic_cmd(const char *me, char *arg)
7
{
8
const char *my_argv[4];
9
10
+ setup_path(NULL);
11
if (!arg || !(arg = sq_dequote(arg)))
12
die("bad argument");
13
if (prefixcmp(me, "git-"))
@@ -29,7 +30,6 @@ static int do_cvs_cmd(const char *me, char *arg)
30
die("git-cvsserver only handles server: %s", arg);
31
32
setup_path(NULL);
32
-
33
return execv_git_cmd(cvsserver_argv);
34
}
35
@@ -49,15 +49,24 @@ int main(int argc, char **argv)
49
char *prog;
50
struct commands *cmd;
51
52
+ /*
53
+ * Special hack to pretend to be a CVS server
54
+ */
55
if (argc == 2 && !strcmp(argv[1], "cvs server"))
56
argv--;
54
- /* We want to see "-c cmd args", and nothing else */
57
+
58
+ /*
59
+ * We do not accept anything but "-c" followed by "cmd arg",
60
+ * where "cmd" is a very limited subset of git commands.
61
+ */
62
else if (argc != 3 || strcmp(argv[1], "-c"))
63
die("What do you think I am? A shell?");
64
65
prog = argv[2];
59
- argv += 2;
60
- argc -= 2;
66
+ if (!strncmp(prog, "git", 3) && isspace(prog[3]))
67
+ /* Accept "git foo" as if the caller said "git-foo". */
68
+ prog[3] = '-';
69
+
70
for (cmd = cmd_list ; cmd->name ; cmd++) {
71
int len = strlen(cmd->name);
72
char *arg;