X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectd.c;h=a3f63b48007336bc48621fa366cbf90a96ccff4c;hb=3f2f61c7d74d9204405a4b0c21390451c98665a7;hp=d2ca56870c9e146a193ba498018d6952601c5513;hpb=d35dd47646956b011a75084a979fd7850cea9a6b;p=collectd.git diff --git a/src/collectd.c b/src/collectd.c index d2ca5687..a3f63b48 100644 --- a/src/collectd.c +++ b/src/collectd.c @@ -32,6 +32,10 @@ #include "plugin.h" #include "configfile.h" +#if HAVE_STATGRAB_H +# include +#endif + /* * Global variables */ @@ -393,11 +397,12 @@ int main (int argc, char **argv) struct sigaction sig_int_action; struct sigaction sig_term_action; struct sigaction sig_usr1_action; + struct sigaction sig_pipe_action; char *configfile = CONFIGFILE; int test_config = 0; const char *basedir; #if COLLECT_DAEMON - struct sigaction sigChldAction; + struct sigaction sig_chld_action; pid_t pid; int daemonize = 1; #endif @@ -482,9 +487,9 @@ int main (int argc, char **argv) /* * fork off child */ - memset (&sigChldAction, '\0', sizeof (sigChldAction)); - sigChldAction.sa_handler = SIG_IGN; - sigaction (SIGCHLD, &sigChldAction, NULL); + memset (&sig_chld_action, '\0', sizeof (sig_chld_action)); + sig_chld_action.sa_handler = SIG_IGN; + sigaction (SIGCHLD, &sig_chld_action, NULL); if (daemonize) { @@ -534,6 +539,10 @@ int main (int argc, char **argv) } /* if (daemonize) */ #endif /* COLLECT_DAEMON */ + memset (&sig_pipe_action, '\0', sizeof (sig_pipe_action)); + sig_pipe_action.sa_handler = SIG_IGN; + sigaction (SIGPIPE, &sig_pipe_action, NULL); + /* * install signal handlers */