#include "gnunet_common.h"
#include "gnunet_signal_lib.h"
+#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
+
+
struct GNUNET_SIGNAL_Context
{
int sig;
GNUNET_SIGNAL_handler_install (int signum, GNUNET_SIGNAL_Handler handler)
{
struct GNUNET_SIGNAL_Context *ret;
+
#ifndef MINGW
struct sigaction sig;
#endif
ret->sig = signum;
ret->method = handler;
#ifndef MINGW
+ memset (&sig, 0, sizeof (sig));
sig.sa_handler = (void *) handler;
sigemptyset (&sig.sa_mask);
#ifdef SA_INTERRUPT
if (signum == GNUNET_SIGCHLD)
w32_sigchld_handler = handler;
else
+ {
+ __p_sig_fn_t sigret = signal (signum, (__p_sig_fn_t) handler);
+
+ if (sigret == SIG_ERR)
{
- __p_sig_fn_t sigret = signal (signum, (__p_sig_fn_t) handler);
- if (sigret == SIG_ERR)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _
- ("signal (%d, %p) returned %d.\n"),
- signum, handler, sigret);
- }
+ LOG (GNUNET_ERROR_TYPE_WARNING, _("signal (%d, %p) returned %d.\n"),
+ signum, handler, sigret);
}
+ }
#endif
return ret;
}