projects
/
unix-history
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
tags
|
clone url
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
ddec42c
..
1998d68
100644
(file)
--- a/
usr/src/lib/libc/gen/signal.c
+++ b/
usr/src/lib/libc/gen/signal.c
@@
-1,36
+1,34
@@
/*
/*
- * Copyright (c) 1985 Regents of the University of California.
- * All rights reserved. The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1985, 1989 Regents of the University of California.
+ * All rights reserved.
+ *
+ * %sccs.include.redist.c%
*/
*/
-#if
ndef lint
-static char sccsid[] = "@(#)signal.c 5.
1
(Berkeley) %G%";
-#endif
not lint
+#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.
*/
#include <signal.h>
/*
* Almost backwards compatible signal.
*/
#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);
}
}