macro and text revision (-mdoc version 3)

[unix-history] / usr / src / lib / libc / gen / signal.c

diff --git a/usr/src/lib/libc/gen/signal.c b/usr/src/lib/libc/gen/signal.c
index 5e742a0..1998d68 100644 (file)
--- a/usr/src/lib/libc/gen/signal.c
+++ b/usr/src/lib/libc/gen/signal.c
@@ -1,25 +1,34 @@
-/*     signal.c        4.1     84/05/16        */
+/*
+ * Copyright (c) 1985, 1989 Regents of the University of California.
+ * All rights reserved.
+ *
+ * %sccs.include.redist.c%
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)signal.c   5.5 (Berkeley) %G%";
+#endif /* LIBC_SCCS and not lint */
+

 /*
  * Almost backwards compatible signal.
 /*
  * Almost backwards compatible signal.

- *     int (*signal(s, a))() int s, (*a)();

  */
  */

-#include <syscall.h>
-#include "DEFS.h"
+#include <signal.h>
+
+sigset_t _sigintr;             /* shared with siginterrupt */
+
+sig_t
+signal(s, a)
+       int s;
+       sig_t a;
+{
+       struct sigaction sa, osa;

 
 

-ENTRY(signal)
-       subl2   $24,sp                  # struct sigvec osv, sv;
-       movl    8(ap),-24(fp)           # sv.sv_handler = a;
-       clrq    -20(fp)                 # sv.sv_mask = sv.sv_onstack = 0;
-       pushal  -12(fp)                 # &osv
-       pushal  -24(fp)                 # &sv
-       pushl   4(ap)                   # s
-       moval   -4(sp),ap
-       chmk    $SYS_sigvec             # sigvec(s, &sv, &osv)
-       jcs     err
-       movl    -12(fp),r0              # return osv.sv_handler;
-       ret
-err:
-       .globl  _errno
-       movl    r0,_errno
-       mnegl   $1,r0
-       ret
+       sa.sa_handler = a;
+       sigemptyset(&sa.sa_mask);
+       sa.sa_flags = 0;
+       if (!sigismember(&_sigintr, s))
+               sa.sa_flags |= SA_RESTART;
+       if (sigaction(s, &sa, &osa) < 0)
+               return (BADSIG);
+       return (osa.sa_handler);
+}