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 1585a09..1998d68 100644 (file)
--- a/usr/src/lib/libc/gen/signal.c
+++ b/usr/src/lib/libc/gen/signal.c
@@ -1,22 +1,12 @@
 /*
 /*

- * Copyright (c) 1985 Regents of the University of California.
+ * Copyright (c) 1985, 1989 Regents of the University of California.

  * All rights reserved.
  *
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * %sccs.include.redist.c%

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)signal.c   5.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)signal.c   5.5 (Berkeley) %G%";

 #endif /* LIBC_SCCS and not lint */
 
 /*
 #endif /* LIBC_SCCS and not lint */
 
 /*


@@ -24,24 +14,21 @@ static char sccsid[] = "@(#)signal.c        5.3 (Berkeley) %G%";
  */
 #include <signal.h>
 
  */
 #include <signal.h>
 

-int (*
-signal(s, a))()
-       int s, (*a)();
+sigset_t _sigintr;             /* shared with siginterrupt */
+
+sig_t
+signal(s, a)
+       int s;
+       sig_t a;

 {
 {

-       struct sigvec osv, sv;
-       static int mask[NSIG];
-       static int flags[NSIG];
+       struct sigaction sa, osa;

 
 

-       sv.sv_handler = a;
-       sv.sv_mask = mask[s];
-       sv.sv_flags = flags[s];
-       if (sigvec(s, &sv, &osv) < 0)
+       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 (BADSIG);

-       if (sv.sv_mask != osv.sv_mask || sv.sv_flags != osv.sv_flags) {
-               mask[s] = sv.sv_mask = osv.sv_mask;
-               flags[s] = sv.sv_flags = osv.sv_flags;
-               if (sigvec(s, &sv, 0) < 0)
-                       return (BADSIG);
-       }
-       return (osv.sv_handler);
+       return (osa.sa_handler);

 }
 }