author | Junio C Hamano <junkio@cox.net> | |
Thu, 22 Jun 2006 09:19:08 +0000 (02:19 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Thu, 22 Jun 2006 09:19:08 +0000 (02:19 -0700) |
* jc/waitpid:
Restore SIGCHLD to SIG_DFL where we care about waitpid().
Restore SIGCHLD to SIG_DFL where we care about waitpid().
connect.c | patch | blob | history | |
daemon.c | patch | blob | history | |
merge-index.c | patch | blob | history |
diff --git a/connect.c b/connect.c
index 52d709e58d53f053ec00bfb9f31501684cbaf0e5..db7342e4d26baa50dd944ebf06fb8b66fea59aaa 100644 (file)
--- a/connect.c
+++ b/connect.c
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';
diff --git a/daemon.c b/daemon.c
index bdfe80d2e4f4fc13ad45bd35aeeeb3ec71422a4f..a19b7b5aaad228396f08b00c9925c555859393b4 100644 (file)
--- a/daemon.c
+++ b/daemon.c
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];
diff --git a/merge-index.c b/merge-index.c
index 024196e7ac53cb9ad09b38ea646bad81aff33306..190e12fb7ceeb012a063f8c97b574e9650d95cc1 100644 (file)
--- a/merge-index.c
+++ b/merge-index.c
{
int i, force_file = 0;
+ /* Without this we cannot rely on waitpid() to tell
+ * what happened to our children.
+ */
+ signal(SIGCHLD, SIG_DFL);
+
if (argc < 3)
usage("git-merge-index [-o] [-q] <merge-program> (-a | <filename>*)");