diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2015-09-17 17:52:14 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2015-10-29 15:38:37 +0100 |
| commit | 858148092d1ef755cd40fea0169259e4ad3e9f02 (patch) | |
| tree | 850f6521d1e5247290f6e4f958a00a481f9f3389 /src/charon-cmd/charon-cmd.c | |
| parent | c6aa606a659704d4a4855a6ab1f698fada9dd77e (diff) | |
| download | strongswan-858148092d1ef755cd40fea0169259e4ad3e9f02.tar.bz2 strongswan-858148092d1ef755cd40fea0169259e4ad3e9f02.tar.xz | |
Replace usages of sigwait(3) with sigwaitinfo(2)
This is basically the same call, but it has the advantage of being
supported by FreeBSD's valgrind, which sigwait() is not.
References #1106.
Diffstat (limited to 'src/charon-cmd/charon-cmd.c')
| -rw-r--r-- | src/charon-cmd/charon-cmd.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/charon-cmd/charon-cmd.c b/src/charon-cmd/charon-cmd.c index 6f2b6f178..b8f943f51 100644 --- a/src/charon-cmd/charon-cmd.c +++ b/src/charon-cmd/charon-cmd.c @@ -17,14 +17,13 @@ */ #include <stdio.h> -#define _POSIX_PTHREAD_SEMANTICS /* for two param sigwait on OpenSolaris */ #include <signal.h> -#undef _POSIX_PTHREAD_SEMANTICS #include <pthread.h> #include <sys/types.h> #include <sys/utsname.h> #include <unistd.h> #include <getopt.h> +#include <errno.h> #include <library.h> #include <hydra.h> @@ -112,12 +111,11 @@ static int run() while (TRUE) { int sig; - int error; - error = sigwait(&set, &sig); - if (error) + sig = sigwaitinfo(&set, NULL); + if (sig == -1) { - DBG1(DBG_DMN, "error %d while waiting for a signal", error); + DBG1(DBG_DMN, "waiting for signal failed: %s", strerror(errno)); return 1; } switch (sig) @@ -382,7 +380,7 @@ int main(int argc, char *argv[]) lib->plugins->status(lib->plugins, LEVEL_CTRL); /* add handler for SEGV and ILL, - * INT, TERM and HUP are handled by sigwait() in run() */ + * INT, TERM and HUP are handled by sigwaitinfo() in run() */ action.sa_handler = segv_handler; action.sa_flags = 0; sigemptyset(&action.sa_mask); |