From: Junio C Hamano Date: Mon, 22 Jan 2007 01:10:51 +0000 (-0800) Subject: Make sure git_connect() always give two file descriptors. X-Git-Tag: v1.5.0-rc3~92 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ec587fde0a76780931c7ac32474c8c000aa45134;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/builtin-archive.c b/builtin-archive.c index 32737d316..f613ac251 100644 --- 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 66daa11a5..78448889d 100644 --- 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); }