From 7042cfcdd6263dc27913a4ddb9999b9a8d93a3a7 Mon Sep 17 00:00:00 2001 From: Brian Somers Date: Tue, 31 Jul 2001 09:53:20 +0000 Subject: [PATCH] Use sigaction() without SA_RESTART rather than signal() so that we don't block in NgRecvData() after receiving a signal. MFC after: 1 week --- libexec/pppoed/pppoed.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/libexec/pppoed/pppoed.c b/libexec/pppoed/pppoed.c index 870df09f659f..f6b4907f25eb 100644 --- a/libexec/pppoed/pppoed.c +++ b/libexec/pppoed/pppoed.c @@ -77,7 +77,6 @@ static void Farewell(int sig) { ReceivedSignal = sig; - signal(sig, SIG_DFL); /* If something makes us block... */ } static int @@ -469,6 +468,7 @@ main(int argc, char **argv) unsigned char response[1024]; const char *prog, *provider, *acname; struct ngm_connect ngc; + struct sigaction act; int ch, cs, ds, ret, optF, optd, optn, sz, f; const char *pidfile; @@ -591,10 +591,14 @@ main(int argc, char **argv) if (!optF && optn) NgSetErrLog(nglog, nglogx); - signal(SIGHUP, Farewell); - signal(SIGINT, Farewell); - signal(SIGQUIT, Farewell); - signal(SIGTERM, Farewell); + memset(&act, '\0', sizeof act); + act.sa_handler = Farewell; + act.sa_flags = SA_RESETHAND; + sigemptyset(&act.sa_mask); + sigaction(SIGHUP, &act, NULL); + sigaction(SIGINT, &act, NULL); + sigaction(SIGQUIT, &act, NULL); + sigaction(SIGTERM, &act, NULL); while (!ReceivedSignal) { if (*provider)