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, 22 insertions, 24 deletions

diff --git a/libc/signal/sysv_signal.c b/libc/signal/sysv_signal.c
index 5756ec484..08b76a519 100644
--- a/libc/signal/sysv_signal.c
+++ b/libc/signal/sysv_signal.c
@@ -2,25 +2,23 @@
    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 Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
+   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
-   Lesser General Public License for more details.
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   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>
 
-#undef signal
-
 /* Tolerate non-threads versions of Posix */
 #ifndef SA_ONESHOT
 #define SA_ONESHOT 0
@@ -34,25 +32,25 @@
 
 /* Set the handler for the signal SIG to HANDLER,
    returning the old handler, or SIG_ERR on error.  */
-__sighandler_t __sysv_signal (int sig, __sighandler_t handler)
+__sighandler_t sysv_signal (int sig, __sighandler_t handler)
 {
-  struct sigaction act, oact;
+    struct sigaction act, oact;
 
-  /* Check signal extents to protect __sigismember.  */
-  if (handler == SIG_ERR || sig < 1 || sig >= NSIG)
+    /* Check signal extents to protect __sigismember.  */
+    if (handler == SIG_ERR || sig < 1 || sig >= NSIG)
     {
-      __set_errno (EINVAL);
-      return SIG_ERR;
+	__set_errno (EINVAL);
+	return SIG_ERR;
     }
 
-  act.sa_handler = handler;
-  if (__sigemptyset (&act.sa_mask) < 0)
-    return SIG_ERR;
-  act.sa_flags = SA_ONESHOT | SA_NOMASK | SA_INTERRUPT;
-  act.sa_flags &= ~SA_RESTART;
-  if (sigaction (sig, &act, &oact) < 0)
-    return SIG_ERR;
+    act.sa_handler = handler;
+    if (__sigemptyset (&act.sa_mask) < 0)
+	return SIG_ERR;
+    act.sa_flags = SA_ONESHOT | SA_NOMASK | SA_INTERRUPT;
+    act.sa_flags &= ~SA_RESTART;
+    if (sigaction (sig, &act, &oact) < 0)
+	return SIG_ERR;
 
-  return oact.sa_handler;
+    return oact.sa_handler;
 }