git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeremiah Mahler <jmmahler@gmail.com>
To: git@vger.kernel.org
Cc: Jeremiah Mahler <jmmahler@gmail.com>
Subject: [PATCH 4/5] daemon.c service_loop(): replace signal() with sigaction()
Date: Tue, 27 May 2014 23:14:14 -0700	[thread overview]
Message-ID: <1401257655-6043-5-git-send-email-jmmahler@gmail.com> (raw)
In-Reply-To: <1401257655-6043-1-git-send-email-jmmahler@gmail.com>

From signal(2)

  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.  See Portability below.

Replaced signal() with sigaction() in daemon.c service_loop()

Signed-off-by: Jeremiah Mahler <jmmahler@gmail.com>
---
 daemon.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/daemon.c b/daemon.c
index 3c48dc0..8c28b3d 100644
--- a/daemon.c
+++ b/daemon.c
@@ -1002,6 +1002,7 @@ static int service_loop(struct socketlist *socklist)
 {
 	struct pollfd *pfd;
 	int i;
+	struct sigaction sa;
 
 	pfd = xcalloc(socklist->nr, sizeof(struct pollfd));
 
@@ -1010,7 +1011,9 @@ static int service_loop(struct socketlist *socklist)
 		pfd[i].events = POLLIN;
 	}
 
-	signal(SIGCHLD, child_handler);
+	memset(&sa, 0, sizeof(sa));
+	sa.sa_handler = child_handler;
+	sigaction(SIGCHLD, &sa, 0);
 
 	for (;;) {
 		int i;
-- 
2.0.0.rc4.6.g127602c

  parent reply	other threads:[~2014-05-28  6:15 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-28  6:14 [PATCH 0/5] replace signal() with sigaction() Jeremiah Mahler
2014-05-28  6:14 ` [PATCH 1/5] progress.c: " Jeremiah Mahler
2014-05-28  8:07   ` Chris Packham
2014-05-28  8:19     ` David Kastrup
2014-05-28  8:48       ` Erik Faye-Lund
2014-05-28  9:11         ` David Kastrup
2014-05-28 17:35       ` Junio C Hamano
2014-05-28 15:45     ` Jeremiah Mahler
2014-05-28  6:14 ` [PATCH 2/5] daemon.c run_service(): " Jeremiah Mahler
2014-05-28  6:14 ` [PATCH 3/5] daemon.c child_handler(): " Jeremiah Mahler
2014-05-28  6:14 ` Jeremiah Mahler [this message]
2014-05-28  6:14 ` [PATCH 5/5] connect.c: " Jeremiah Mahler
2014-05-28  7:40 ` [PATCH 0/5] " Johannes Sixt
2014-05-28  8:11   ` Chris Packham
2014-05-28  8:23     ` Erik Faye-Lund
2014-05-28 16:11   ` Jeremiah Mahler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1401257655-6043-5-git-send-email-jmmahler@gmail.com \
    --to=jmmahler@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).