Start 1.6.0.4 cycle

diff --git a/shell.c b/shell.c
index c983fc7b86ed3c7792d4e325e4b88845719494d1..e3393690dd3b79af80e6b95710583e744fd574d4 100644 (file)
--- a/shell.c
+++ b/shell.c
@@ -1,11 +1,13 @@
 #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-"))
@@ -18,12 +20,27 @@ static int do_generic_cmd(const char *me, char *arg)
        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 },
 };
 
@@ -31,14 +48,38 @@ int main(int argc, char **argv)
 {
        char *prog;
        struct commands *cmd;
+       int devnull_fd;
+
+       /*
+        * Always open file descriptors 0/1/2 to avoid clobbering files
+        * in die().  It also avoids not messing up when the pipes are
+        * dup'ed onto stdin/stdout/stderr in the child processes we spawn.
+        */
+       devnull_fd = open("/dev/null", O_RDWR);
+       while (devnull_fd >= 0 && devnull_fd <= 2)
+               devnull_fd = dup(devnull_fd);
+       if (devnull_fd == -1)
+               die("opening /dev/null failed (%s)", strerror(errno));
+       close (devnull_fd);
 
-       /* We want to see "-c cmd args", and nothing else */
-       if (argc != 3 || strcmp(argv[1], "-c"))
+       /*
+        * 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];
-       argv += 2;
-       argc -= 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;