summaryrefslogtreecommitdiff
path: root/daemon.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-20 01:47:51 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-06-20 01:47:51 (GMT)
commit592689c46187165d80ab35c9090404b7ee248dbb (patch)
tree8a5a72b6a7a90f278ab2885849d9bb97fdaf13ca /daemon.c
parentb19beecd9456a2e6282634e5df751206b972604a (diff)
parentf0b7367cb124a628b80697f5ed095c5859022e21 (diff)
downloadgit-592689c46187165d80ab35c9090404b7ee248dbb.zip
git-592689c46187165d80ab35c9090404b7ee248dbb.tar.gz
git-592689c46187165d80ab35c9090404b7ee248dbb.tar.bz2
Merge branch 'jc/waitpid' into next
* jc/waitpid: Restore SIGCHLD to SIG_DFL where we care about waitpid().
Diffstat (limited to 'daemon.c')
-rw-r--r--daemon.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/daemon.c b/daemon.c
index 2f03f99..1067004 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];