Libc-594.9.5.tar.gz

[apple/libc.git] / sys / sigaction.c

diff --git a/sys/sigaction.c b/sys/sigaction.c
index 9b57cc43dd80938d6a4ec407f6a2b841333d8f93..2e9652cdfb7e7d5e568591d4232b6e5c4766923c 100644 (file)
--- a/sys/sigaction.c
+++ b/sys/sigaction.c
@@ -3,8 +3,6 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
@@ -28,7 +26,6 @@
  *     @(#)sigaction.c 1.0
  */
 
-#include <sys/syscall.h>
 #include <unistd.h>
 #include <signal.h>
 #include <sys/signal.h>
@@ -39,16 +36,10 @@
  *     as the signal handler instead.  The code here is derived
  *     from sigvec in sys/kern_sig.c.
  */
+extern int __sigaction (int, struct __sigaction * __restrict, struct sigaction * __restrict);
 
-#if defined(__DYNAMIC__)
-extern int __in_sigtramp;
-#endif
-
-static int
-sigaction__ (sig, nsv, osv, bind)
-        int sig;
-       register struct sigaction *nsv, *osv;
-        int bind;
+int
+sigaction (int sig, const struct sigaction * __restrict nsv, struct sigaction * __restrict osv)
 {
        extern void _sigtramp();
        struct __sigaction sa;
@@ -65,27 +56,8 @@ sigaction__ (sig, nsv, osv, bind)
                sa.sa_mask = nsv->sa_mask;
                sa.sa_flags = nsv->sa_flags;    
                sap = &sa;
-               if (nsv->sa_handler != (void (*)())SIG_DFL && nsv->sa_handler != (void (*)())SIG_IGN) {
-#ifdef __DYNAMIC__
-                    if (bind && (__in_sigtramp == 0))                          // XXX
-                 _dyld_bind_fully_image_containing_address(nsv->sa_handler);
-#endif
-               }
-       }
-       if (syscall (SYS_sigaction, sig, sap, osv) < 0) {
-               return (-1);
        }
-       return (0);
-}
-
-
-int
-sigaction (sig, nsv, osv)
-        int sig;
-       register const struct sigaction *nsv;
-        register struct sigaction *osv;
-{
-    return sigaction__(sig, nsv, osv, 1);
+       return __sigaction(sig, sap, osv);
 }
 
 // XXX
@@ -97,7 +69,7 @@ _sigaction_nobind (sig, nsv, osv)
        register const struct sigaction *nsv;
         register struct sigaction *osv;
 {
-    return sigaction__(sig, nsv, osv, 0);
+    return sigaction(sig, nsv, osv);
 }
 #endif