--- Libc/Libc-391/sys/sigaction.c
+++ Libc/Libc-262/sys/sigaction.c
@@ -3,20 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * 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.
+ * 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.
  * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -27,7 +26,6 @@
  */
 
 #include <sys/syscall.h>
-#include <unistd.h>
 #include <signal.h>
 #include <sys/signal.h>
 #include <errno.h>
@@ -38,9 +36,18 @@
  *	from sigvec in sys/kern_sig.c.
  */
 
-int
-sigaction (int sig, const struct sigaction * __restrict nsv, struct sigaction * __restrict osv)
+#if defined(__DYNAMIC__)
+extern int __in_sigtramp;
+#endif
+
+static int
+sigaction__ (sig, nsv, osv, bind)
+        int sig;
+	register struct sigaction *nsv, *osv;
+        int bind;
 {
+	struct sigaction vec;
+	void (*prevsig)();
 	extern void _sigtramp();
 	struct __sigaction sa;
 	struct __sigaction *sap;
@@ -56,11 +63,27 @@
 		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);
 }
 
 // XXX
@@ -72,7 +95,7 @@
 	register const struct sigaction *nsv;
         register struct sigaction *osv;
 {
-    return sigaction(sig, nsv, osv);
+    return sigaction__(sig, nsv, osv, 0);
 }
 #endif