projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
uuid plugin: make it work on OSX
[collectd.git]
/
src
/
exec.c
diff --git
a/src/exec.c
b/src/exec.c
index
6d5908c
..
699041a
100644
(file)
--- a/
src/exec.c
+++ b/
src/exec.c
@@
-27,6
+27,7
@@
#define _BSD_SOURCE /* For setgroups */
#include "collectd.h"
#define _BSD_SOURCE /* For setgroups */
#include "collectd.h"
+
#include "common.h"
#include "plugin.h"
#include "common.h"
#include "plugin.h"
@@
-38,8
+39,6
@@
#include <grp.h>
#include <signal.h>
#include <grp.h>
#include <signal.h>
-#include <pthread.h>
-
#define PL_NORMAL 0x01
#define PL_NOTIF_ACTION 0x02
#define PL_NORMAL 0x01
#define PL_NOTIF_ACTION 0x02
@@
-348,7
+347,6
@@
static void reset_signal_mask (void) /* {{{ */
{
sigset_t ss;
{
sigset_t ss;
- memset (&ss, 0, sizeof (ss));
sigemptyset (&ss);
sigprocmask (SIG_SETMASK, &ss, /* old mask = */ NULL);
} /* }}} void reset_signal_mask */
sigemptyset (&ss);
sigprocmask (SIG_SETMASK, &ss, /* old mask = */ NULL);
} /* }}} void reset_signal_mask */
@@
-806,10
+804,10
@@
static void *exec_notification_one (void *arg) /* {{{ */
static int exec_init (void) /* {{{ */
{
static int exec_init (void) /* {{{ */
{
- struct sigaction sa;
+ struct sigaction sa = {
+ .sa_handler = sigchld_handler
+ };
- memset (&sa, '\0', sizeof (sa));
- sa.sa_handler = sigchld_handler;
sigaction (SIGCHLD, &sa, NULL);
return (0);
sigaction (SIGCHLD, &sa, NULL);
return (0);