[PATCH v3 7/9] builtin/merge-index.c: replace signal() with sigaction()
From: Jeremiah Mahler <hidden>
Date: 2016-06-15 23:01:26
Subsystem:
the rest · Maintainer:
Linus Torvalds
From the signal(2) man page: The behavior of signal() varies across UNIX versions, and has also var‐ ied historically across different versions of Linux. Avoid its use: use sigaction(2) instead. Replaced signal() with sigaction() in builtin/merge-index.c Signed-off-by: Jeremiah Mahler <redacted> --- builtin/merge-index.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/builtin/merge-index.c b/builtin/merge-index.c
index b416d92..25db374 100644
--- a/builtin/merge-index.c
+++ b/builtin/merge-index.c@@ -68,11 +68,14 @@ static void merge_all(void) int cmd_merge_index(int argc, const char **argv, const char *prefix) { int i, force_file = 0; + struct sigaction sa; /* Without this we cannot rely on waitpid() to tell * what happened to our children. */ - signal(SIGCHLD, SIG_DFL); + memset(&sa, 0, sizeof(sa)); + sa.sa_handler = SIG_DFL; + sigaction(SIGCHLD, &sa, NULL); if (argc < 3) usage("git merge-index [-o] [-q] <merge-program> (-a | [--] <filename>*)");
--
2.0.0.8.g7bf6e1f.dirty