2 files changed, 17 insertions, 13 deletions

diff --git a/src/lib/libc/net/rcmd.c b/src/lib/libc/net/rcmd.c
index 1439fff061..a9fdc1b1d0 100644
--- a/src/lib/libc/net/rcmd.c
+++ b/src/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);
 }
 
diff --git a/src/lib/libc/stdlib/system.c b/src/lib/libc/stdlib/system.c
index 3e1b047393..dadf3fe841 100644
--- a/src/lib/libc/stdlib/system.c
+++ b/src/lib/libc/stdlib/system.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: system.c,v 1.3 1996/09/15 09:31:52 tholo Exp $";
+static char *rcsid = "$OpenBSD: system.c,v 1.4 2001/09/04 23:35:58 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -50,7 +50,7 @@ system(command)
 {
         pid_t pid;
         sig_t intsave, quitsave;
-        int omask;
+        sigset_t mask, omask;
         int pstat;
         char *argp[] = {"sh", "-c", NULL, NULL};
 
@@ -59,13 +59,15 @@ system(command)
 
         argp[2] = (char *)command;
 
-        omask = sigblock(sigmask(SIGCHLD));
+        sigemptyset(&mask);
+        sigaddset(&mask, SIGCHLD);
+        sigprocmask(SIG_BLOCK, &mask, &omask);
         switch(pid = vfork()) {
         case -1:                        /* error */
-                (void)sigsetmask(omask);
+                sigprocmask(SIG_SETMASK, &omask, NULL);
                 return(-1);
         case 0:                         /* child */
-                (void)sigsetmask(omask);
+                sigprocmask(SIG_SETMASK, &omask, NULL);
                 execve(_PATH_BSHELL, argp, environ);
                 _exit(127);
         }
@@ -73,7 +75,7 @@ system(command)
         intsave = signal(SIGINT, SIG_IGN);
         quitsave = signal(SIGQUIT, SIG_IGN);
         pid = waitpid(pid, (int *)&pstat, 0);
-        (void)sigsetmask(omask);
+        sigprocmask(SIG_SETMASK, &omask, NULL);
         (void)signal(SIGINT, intsave);
         (void)signal(SIGQUIT, quitsave);
         return(pid == -1 ? -1 : pstat);