fix

[oweals/gnunet.git] / src / util / signal.c

diff --git a/src/util/signal.c b/src/util/signal.c
index 478551ca28d535dc150df4249d516420729c3dcd..a986b6260554e3492dfa47ae78c9bf0be0c128f6 100644 (file)
--- a/src/util/signal.c
+++ b/src/util/signal.c
@@ -28,6 +28,9 @@
 #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;
@@ -39,26 +42,45 @@ struct GNUNET_SIGNAL_Context
 #endif
 };
 
+#ifdef WINDOWS
+GNUNET_SIGNAL_Handler w32_sigchld_handler = NULL;
+#endif
+
 struct GNUNET_SIGNAL_Context *
-GNUNET_SIGNAL_handler_install (int signal, GNUNET_SIGNAL_Handler handler)
+GNUNET_SIGNAL_handler_install (int signum, GNUNET_SIGNAL_Handler handler)
 {
   struct GNUNET_SIGNAL_Context *ret;
+
 #ifndef MINGW
   struct sigaction sig;
 #endif
 
   ret = GNUNET_malloc (sizeof (struct GNUNET_SIGNAL_Context));
-  ret->sig = signal;
+  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
-  sig.sa_flags = SA_INTERRUPT;  /* SunOS */
+  sig.sa_flags = SA_INTERRUPT; /* SunOS */
 #else
   sig.sa_flags = SA_RESTART;
 #endif
-  sigaction (signal, &sig, &ret->oldsig);
+  sigaction (signum, &sig, &ret->oldsig);
+#else
+  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)
+       {
+         LOG (GNUNET_ERROR_TYPE_WARNING,
+              _("signal (%d, %p) returned %d.\n"), signum, handler, sigret);
+       }
+    }
 #endif
   return ret;
 }