Libc-391.2.9.tar.gz

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

diff --git a/sys/sigaction.c b/sys/sigaction.c
index 1c3709e9e887e99765d3288f1a37ebb3ab6f42ff..7686b1e3d4bdf8e2c9a344ddde65c8a83ce3835e 100644 (file)
--- a/sys/sigaction.c
+++ b/sys/sigaction.c
@@ -3,19 +3,20 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * 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
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -26,6 +27,7 @@
  */
 
 #include <sys/syscall.h>
+#include <unistd.h>
 #include <signal.h>
 #include <sys/signal.h>
 #include <errno.h>
@@ -36,18 +38,9 @@
  *     from sigvec in sys/kern_sig.c.
  */
 
-#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)
 {
-       struct sigaction vec;
-       void (*prevsig)();
        extern void _sigtramp();
        struct __sigaction sa;
        struct __sigaction *sap;
@@ -63,12 +56,6 @@ 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);
@@ -76,16 +63,6 @@ sigaction__ (sig, nsv, osv, bind)
        return (0);
 }
 
-
-int
-sigaction (sig, nsv, osv)
-        int sig;
-       register const struct sigaction *nsv;
-        register struct sigaction *osv;
-{
-    return sigaction__(sig, nsv, osv, 1);
-}
-
 // XXX
 #ifdef __DYNAMIC__
 
@@ -95,7 +72,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