summaryrefslogtreecommitdiff
path: root/connect.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-19 18:25:21 -0700
committerJunio C Hamano <junkio@cox.net>2006-06-19 18:44:58 -0700
commitf0b7367cb124a628b80697f5ed095c5859022e21 (patch)
tree5a7d667c5985adb52169ec8de065bbf39a3641b8 /connect.c
parentd281786fcd6d0df47dd46e415f1a804b2e81ed9b (diff)
downloadgit-f0b7367cb124a628b80697f5ed095c5859022e21.tar.gz
Restore SIGCHLD to SIG_DFL where we care about waitpid().
It was reported that under one implementation of socks client "git clone" fails with "error: waitpid failed (No child processes)", because "git" is spawned after setting SIGCHLD to SIG_IGN. Arguably it may be a broken setting, but we should protect ourselves so that we can get reliable results from waitpid() for the children we care about. This patch resets SIGCHLD to SIG_DFL in three places: - connect.c::git_connect() - initiators of git native protocol transfer are covered with this. - daemon.c::main() - obviously. - merge-index.c::main() - obviously. There are other programs that do fork() but do not waitpid(): http-push, imap-send. upload-pack does not either, but in the case of that program, each of the forked halves runs exec() another program, so this change would not have much effect there. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'connect.c')
-rw-r--r--connect.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/connect.c b/connect.c
index 52d709e58d..db7342e4d2 100644
--- a/connect.c
+++ b/connect.c
@@ -581,6 +581,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';