Make sure git_connect() always give two file descriptors.

Earlier, git_connect() returned the same fd twice or two
separate fds, depending on the way the connection was made (when
we are talking to the other end over a single socket, we used
the same fd twice, and when our end is connected to a pipepair
we used two).

This forced callers who do close() and dup() to really care
which was which, and most of the existing callers got this
wrong, although without much visible ill effect.  Many were
closing the same fd twice when we are talking over a single
socket, and one was leaking a fd.

This fixes it to uniformly use two separate fds, so if somebody
wants to close only reader side can just do close() on it
without worrying about it accidentally also closing the writer
side or vice versa.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/builtin-archive.c b/builtin-archive.c
index 32737d31621e8d1a900d944f97fcaae43d56a12e..f613ac25164beadb4874d8a07b6bbac62796a530 100644 (file)
--- a/builtin-archive.c
+++ b/builtin-archive.c
@@ -74,6 +74,7 @@ static int run_remote_archiver(const char *remote, int argc,
        /* Now, start reading from fd[0] and spit it out to stdout */
        rv = recv_sideband("archive", fd[0], 1, 2);
        close(fd[0]);
+       close(fd[1]);
        rv |= finish_connect(pid);
 
        return !!rv;

diff --git a/connect.c b/connect.c
index 66daa11a5737efd6ee2dbd6ff2ad0e1475fcba20..78448889da3f11fa28aacad17d3044a1c0df7e54 100644 (file)
--- a/connect.c
+++ b/connect.c
@@ -529,7 +529,7 @@ static void git_tcp_connect(int fd[2], char *host)
        int sockfd = git_tcp_connect_sock(host);
 
        fd[0] = sockfd;
-       fd[1] = sockfd;
+       fd[1] = dup(sockfd);
 }