Once again, rework the signal handling to be even more correct. We no

longer segfault when running test/signal/sigchld.c, which exposed a bit
of a rats nest.  The problem ended up being a erroneous syscall
defination, but in the process of finding that out, I scrubbed things
up nicely and adapted things to use the rt_ signals if they are
available.  This now passes all the signal tests.
 -Erik

1 files changed, 43 insertions, 17 deletions

diff --git a/libc/signal/signal.c b/libc/signal/signal.c
index 2397c55e7..463de1e50 100644
--- a/libc/signal/signal.c
+++ b/libc/signal/signal.c
@@ -1,23 +1,49 @@
-#include <string.h>
+/* BSD-like signal function.
+   Copyright (C) 1991, 1992, 1996, 1997, 2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <errno.h>
 #include <signal.h>
 
-/* Global variable */
-sigset_t _sigintr;              /* Set by siginterrupt.  */
 
-__sighandler_t
-__signal (int sig, __sighandler_t handler, int flags)
-{
-  int ret;
-  struct sigaction action, oaction;
-  memset(&action, 0, sizeof(struct sigaction));
-  action.sa_handler = handler;
-  action.sa_flags = flags;
-  ret = sigaction (sig, &action, &oaction); 
-  return (ret == -1) ? SIG_ERR : oaction.sa_handler;
-}
+sigset_t _sigintr;		/* Set by siginterrupt.  */
 
-__sighandler_t
-signal (int sig, __sighandler_t handler)
+/* Set the handler for the signal SIG to HANDLER,
+   returning the old handler, or SIG_ERR on error.  */
+__sighandler_t bsd_signal (int sig, __sighandler_t handler)
 {
-  return __signal(sig, handler, (SA_ONESHOT | SA_NOMASK | SA_INTERRUPT) & ~SA_RESTART);
+    struct sigaction act, oact;
+
+    /* Check signal extents to protect __sigismember.  */
+    if (handler == SIG_ERR || sig < 1 || sig >= NSIG)
+    {
+	__set_errno (EINVAL);
+	return SIG_ERR;
+    }
+
+    act.sa_handler = handler;
+    if (__sigemptyset (&act.sa_mask) < 0
+	    || __sigaddset (&act.sa_mask, sig) < 0)
+	return SIG_ERR;
+    act.sa_flags = __sigismember (&_sigintr, sig) ? 0 : SA_RESTART;
+    if (sigaction (sig, &act, &oact) < 0)
+	return SIG_ERR;
+
+    return oact.sa_handler;
 }
+weak_alias (bsd_signal, signal)