--- Libc/Libc-498/sys/sigaction.c
+++ Libc/Libc-320/sys/sigaction.c
@@ -2,6 +2,8 @@
  * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
  *
  * @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
@@ -26,6 +28,7 @@
  *	@(#)sigaction.c	1.0
  */
 
+#include <sys/syscall.h>
 #include <unistd.h>
 #include <signal.h>
 #include <sys/signal.h>
@@ -36,10 +39,16 @@
  *	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);
 
-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;
 {
 	extern void _sigtramp();
 	struct __sigaction sa;
@@ -56,8 +65,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
+	        }
 	}
-	return __sigaction(sig, sap, osv);
+	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
@@ -69,7 +97,7 @@
 	register const struct sigaction *nsv;
         register struct sigaction *osv;
 {
-    return sigaction(sig, nsv, osv);
+    return sigaction__(sig, nsv, osv, 0);
 }
 #endif