diff options
| author |   millert <millert@openbsd.org> | 2001-09-04 23:35:57 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2001-09-04 23:35:57 +0000 |
| commit | 9a7fa6a3bae31e414517a8c0f42be17b33cbbdde (patch) | |
| tree | 000cb82ab8dd6c4281507d04c77945ba5fb9f0d5 /lib/libc/net/rcmd.c | |
| parent | Use _waitq_remove() and _waitq_insert() always; from FreeBSD. (diff) | |
| download | wireguard-openbsd-9a7fa6a3bae31e414517a8c0f42be17b33cbbdde.tar.xz wireguard-openbsd-9a7fa6a3bae31e414517a8c0f42be17b33cbbdde.zip | |
Replace the deprecated BSD sigsetmask/sigblock/sigpause functions with their POSIX counterparts.
Diffstat (limited to 'lib/libc/net/rcmd.c')
| -rw-r--r-- | lib/libc/net/rcmd.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/lib/libc/net/rcmd.c b/lib/libc/net/rcmd.c index 1439fff061a..a9fdc1b1d04 100644 --- a/lib/libc/net/rcmd.c +++ b/lib/libc/net/rcmd.c @@ -34,7 +34,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: rcmd.c,v 1.38 2001/06/27 00:58:55 lebel Exp $"; +static char *rcsid = "$OpenBSD: rcmd.c,v 1.39 2001/09/04 23:35:58 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> @@ -87,7 +87,7 @@ rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, af) int error; struct sockaddr_storage from; fd_set *readsp = NULL; - int oldmask; + sigset_t oldmask, mask; pid_t pid; int s, lport, timo; char c, *p; @@ -132,7 +132,9 @@ rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, af) r = res; refused = 0; - oldmask = sigblock(sigmask(SIGURG)); + sigemptyset(&mask); + sigaddset(&mask, SIGURG); + oldmask = sigprocmask(SIG_BLOCK, &mask, &oldmask); for (timo = 1, lport = IPPORT_RESERVED - 1;;) { s = rresvport_af(&lport, r->ai_family); if (s < 0) { @@ -146,7 +148,7 @@ rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, af) r = r->ai_next; continue; } else { - sigsetmask(oldmask); + sigprocmask(SIG_SETMASK, &oldmask, NULL); freeaddrinfo(res); return (-1); } @@ -194,7 +196,7 @@ rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, af) } (void)fprintf(stderr, "%s: %s\n", res->ai_canonname, strerror(errno)); - sigsetmask(oldmask); + sigprocmask(SIG_SETMASK, &oldmask, NULL); freeaddrinfo(res); return (-1); } @@ -306,7 +308,7 @@ again: } goto bad2; } - sigsetmask(oldmask); + sigprocmask(SIG_SETMASK, &oldmask, NULL); free(readsp); return (s); bad2: @@ -316,7 +318,7 @@ bad: if (readsp) free(readsp); (void)close(s); - sigsetmask(oldmask); + sigprocmask(SIG_SETMASK, &oldmask, NULL); return (-1); } |