(sigaction): Handle NULL argument.

1998-08-08 11:18  H.J. Lu  <hjl@gnu.org>

	* signals.c (sigaction): Handle NULL argument.

diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 26a87cb..c89fa75 100644 (file)
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,7 @@
+1998-08-08 11:18  H.J. Lu  <hjl@gnu.org>
+
+       * signals.c (sigaction): Handle NULL argument.
+
 1998-08-04  Ulrich Drepper  <drepper@cygnus.com>
 
        * sysdeps/unix/sysv/linux/bits/sigthread.h: Use __sigset_t instead

diff --git a/linuxthreads/signals.c b/linuxthreads/signals.c
index ac752d1..392b5ea 100644 (file)
--- a/linuxthreads/signals.c
+++ b/linuxthreads/signals.c
@@ -93,16 +93,24 @@ int sigaction(int sig, const struct sigaction * act,
               struct sigaction * oact)
 {
   struct sigaction newact;
+  struct sigaction *newactp;
 
   if (sig == __pthread_sig_restart || sig == __pthread_sig_cancel)
     return EINVAL;
-  newact = *act;
-  if (act->sa_handler != SIG_IGN && act->sa_handler != SIG_DFL)
-    newact.sa_handler = pthread_sighandler;
-  if (__sigaction(sig, &newact, oact) == -1)
+  if (act)
+    {
+      newact = *act;
+      if (act->sa_handler != SIG_IGN && act->sa_handler != SIG_DFL)
+       newact.sa_handler = pthread_sighandler;
+      newactp = &newact;
+    }
+  else
+    newactp = NULL;
+  if (__sigaction(sig, newactp, oact) == -1)
     return -1;
   if (oact != NULL) oact->sa_handler = sighandler[sig];
-  sighandler[sig] = act->sa_handler;
+  if (act)
+    sighandler[sig] = act->sa_handler;
   return 0;
 }