Add get_merge_bases_clean()

diff --git a/connect.c b/connect.c
index 6a8f8a6a24dd8894cfcb7e89d8952a9a595d5200..cb4656d79d3bd2d22f719724f4c393b6ac70f633 100644 (file)
--- a/connect.c
+++ b/connect.c
@@ -8,6 +8,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
+#include <signal.h>
 
 static char *server_capabilities = NULL;
 
@@ -100,7 +101,7 @@ int path_match(const char *path, int nr, char **match)
                if (pathlen > len && path[pathlen - len - 1] != '/')
                        continue;
                *s = 0;
-               return 1;
+               return (i + 1);
        }
        return 0;
 }
@@ -322,11 +323,14 @@ static enum protocol get_protocol(const char *name)
 
 #ifndef NO_IPV6
 
-static int git_tcp_connect(int fd[2], const char *prog, char *host, char *path)
+/*
+ * Returns a connected socket() fd, or else die()s.
+ */
+static int git_tcp_connect_sock(char *host)
 {
        int sockfd = -1;
        char *colon, *end;
-       char *port = STR(DEFAULT_GIT_PORT);
+       const char *port = STR(DEFAULT_GIT_PORT);
        struct addrinfo hints, *ai0, *ai;
        int gai;
 
@@ -356,7 +360,8 @@ static int git_tcp_connect(int fd[2], const char *prog, char *host, char *path)
                die("Unable to look up %s (%s)", host, gai_strerror(gai));
 
        for (ai0 = ai; ai; ai = ai->ai_next) {
-               sockfd = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+               sockfd = socket(ai->ai_family,
+                               ai->ai_socktype, ai->ai_protocol);
                if (sockfd < 0)
                        continue;
                if (connect(sockfd, ai->ai_addr, ai->ai_addrlen) < 0) {
@@ -372,15 +377,15 @@ static int git_tcp_connect(int fd[2], const char *prog, char *host, char *path)
        if (sockfd < 0)
                die("unable to connect a socket (%s)", strerror(errno));
 
-       fd[0] = sockfd;
-       fd[1] = sockfd;
-       packet_write(sockfd, "%s %s\n", prog, path);
-       return 0;
+       return sockfd;
 }
 
 #else /* NO_IPV6 */
 
-static int git_tcp_connect(int fd[2], const char *prog, char *host, char *path)
+/*
+ * Returns a connected socket() fd, or else die()s.
+ */
+static int git_tcp_connect_sock(char *host)
 {
        int sockfd = -1;
        char *colon, *end;
@@ -407,7 +412,6 @@ static int git_tcp_connect(int fd[2], const char *prog, char *host, char *path)
                port = colon + 1;
        }
 
-
        he = gethostbyname(host);
        if (!he)
                die("Unable to look up %s (%s)", host, hstrerror(h_errno));
@@ -441,13 +445,20 @@ static int git_tcp_connect(int fd[2], const char *prog, char *host, char *path)
        if (sockfd < 0)
                die("unable to connect a socket (%s)", strerror(errno));
 
+       return sockfd;
+}
+
+#endif /* NO_IPV6 */
+
+
+static void git_tcp_connect(int fd[2], char *host)
+{
+       int sockfd = git_tcp_connect_sock(host);
+
        fd[0] = sockfd;
        fd[1] = sockfd;
-       packet_write(sockfd, "%s %s\n", prog, path);
-       return 0;
 }
 
-#endif /* NO_IPV6 */
 
 static char *git_proxy_command = NULL;
 static const char *rhost_name = NULL;
@@ -510,9 +521,9 @@ static int git_use_proxy(const char *host)
        return (git_proxy_command && *git_proxy_command);
 }
 
-static int git_proxy_connect(int fd[2], const char *prog, char *host, char *path)
+static void git_proxy_connect(int fd[2], char *host)
 {
-       char *port = STR(DEFAULT_GIT_PORT);
+       const char *port = STR(DEFAULT_GIT_PORT);
        char *colon, *end;
        int pipefd[2][2];
        pid_t pid;
@@ -547,12 +558,12 @@ static int git_proxy_connect(int fd[2], const char *prog, char *host, char *path
                execlp(git_proxy_command, git_proxy_command, host, port, NULL);
                die("exec failed");
        }
+       if (pid < 0)
+               die("fork failed");
        fd[0] = pipefd[0][0];
        fd[1] = pipefd[1][1];
        close(pipefd[0][1]);
        close(pipefd[1][0]);
-       packet_write(fd[1], "%s %s\n", prog, path);
-       return pid;
 }
 
 /*
@@ -569,6 +580,11 @@ int git_connect(int fd[2], char *url, const char *prog)
        enum protocol protocol = PROTO_LOCAL;
        int free_path = 0;
 
+       /* Without this we cannot rely on waitpid() to tell
+        * what happened to our children.
+        */
+       signal(SIGCHLD, SIG_DFL);
+
        host = strstr(url, "://");
        if(host) {
                *host = '\0';
@@ -620,19 +636,33 @@ int git_connect(int fd[2], char *url, const char *prog)
        }
 
        if (protocol == PROTO_GIT) {
-               int ret;
+               /* These underlying connection commands die() if they
+                * cannot connect.
+                */
+               char *target_host = strdup(host);
                if (git_use_proxy(host))
-                       ret = git_proxy_connect(fd, prog, host, path);
+                       git_proxy_connect(fd, host);
                else
-                       ret = git_tcp_connect(fd, prog, host, path);
+                       git_tcp_connect(fd, host);
+               /*
+                * Separate original protocol components prog and path
+                * from extended components with a NUL byte.
+                */
+               packet_write(fd[1],
+                            "%s %s%chost=%s%c",
+                            prog, path, 0,
+                            target_host, 0);
+               free(target_host);
                if (free_path)
                        free(path);
-               return ret;
+               return 0;
        }
 
        if (pipe(pipefd[0]) < 0 || pipe(pipefd[1]) < 0)
                die("unable to create pipe pair for communication");
        pid = fork();
+       if (pid < 0)
+               die("unable to fork");
        if (!pid) {
                snprintf(command, sizeof(command), "%s %s", prog,
                         sq_quote(path));