From f0b7367cb124a628b80697f5ed095c5859022e21 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 19 Jun 2006 18:25:21 -0700 Subject: 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 --- daemon.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'daemon.c') diff --git a/daemon.c b/daemon.c index 2f03f99d2..10670047f 100644 --- a/daemon.c +++ b/daemon.c @@ -671,6 +671,11 @@ int main(int argc, char **argv) int inetd_mode = 0; int i; + /* Without this we cannot rely on waitpid() to tell + * what happened to our children. + */ + signal(SIGCHLD, SIG_DFL); + for (i = 1; i < argc; i++) { char *arg = argv[i]; -- cgit v1.2.1