Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Various clean up and bug fixes. Make this look like the SVR4 and Linux 

versions.
This commit is contained in:
mycroft 1995-08-14 00:44:12 +00:00
parent ca057762b9
commit a6bb142d21
1 changed files with 300 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

517
sys/compat/ibcs2/ibcs2_signal.c
View File

@ -1,3 +1,5 @@
/* $NetBSD: ibcs2_signal.c,v 1.4 1995/08/14 00:44:12 mycroft Exp $ */
/* /*
* Copyright (c) 1995 Scott Bartram * Copyright (c) 1995 Scott Bartram
* All rights reserved. * All rights reserved.
@ -29,26 +31,71 @@
#include <sys/systm.h> #include <sys/systm.h>
#include <sys/namei.h> #include <sys/namei.h>
#include <sys/proc.h> #include <sys/proc.h>
#include <sys/file.h>
#include <sys/stat.h>
#include <sys/filedesc.h> #include <sys/filedesc.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/kernel.h>
#include <sys/mount.h> #include <sys/mount.h>
#include <sys/malloc.h> #include <sys/kernel.h>
#include <sys/signal.h> #include <sys/signal.h>
#include <sys/signalvar.h>
#include <sys/malloc.h>
#include <sys/syscallargs.h> #include <sys/syscallargs.h>
#include <compat/ibcs2/ibcs2_types.h> #include <compat/ibcs2/ibcs2_types.h>
#include <compat/ibcs2/ibcs2_fcntl.h>
#include <compat/ibcs2/ibcs2_signal.h>
#include <compat/ibcs2/ibcs2_syscallargs.h> #include <compat/ibcs2/ibcs2_syscallargs.h>
#include <compat/ibcs2/ibcs2_util.h> #include <compat/ibcs2/ibcs2_util.h>
#include <compat/ibcs2/ibcs2_signal.h>
#define NOSIG (-1) #include <sys/file.h>
#include <sys/stat.h>
#include <compat/ibcs2/ibcs2_fcntl.h>
static int ibcs2bsd_sigtbl[IBCS2_NSIG] = { #define sigemptyset(s) bzero((s), sizeof(*(s)))
NOSIG, /* 0 */ #define sigismember(s, n) (*(s) & sigmask(n))
#define sigaddset(s, n) (*(s) |= sigmask(n))
#define ibcs2_sigmask(n) (1 << ((n) - 1))
#define ibcs2_sigemptyset(s) bzero((s), sizeof(*(s)))
#define ibcs2_sigismember(s, n) (*(s) & ibcs2_sigmask(n))
#define ibcs2_sigaddset(s, n) (*(s) |= ibcs2_sigmask(n))
int bcd_to_ibcs2_sig[] = {
0, /* 0 */
IBCS2_SIGHUP, /* 1 */
IBCS2_SIGINT, /* 2 */
IBCS2_SIGQUIT, /* 3 */
IBCS2_SIGILL, /* 4 */
IBCS2_SIGTRAP, /* 5 */
IBCS2_SIGABRT, /* 6 */
IBCS2_SIGEMT, /* 7 */
IBCS2_SIGFPE, /* 8 */
IBCS2_SIGKILL, /* 9 */
IBCS2_SIGBUS, /* 10 */
IBCS2_SIGSEGV, /* 11 */
IBCS2_SIGSYS, /* 12 */
IBCS2_SIGPIPE, /* 13 */
IBCS2_SIGALRM, /* 14 */
IBCS2_SIGTERM, /* 15 */
0, /* 16 - SIGURG */
IBCS2_SIGSTOP, /* 17 */
IBCS2_SIGTSTP, /* 18 */
IBCS2_SIGCONT, /* 19 */
IBCS2_SIGCLD, /* 20 */
IBCS2_SIGTTIN, /* 21 */
IBCS2_SIGTTOU, /* 22 */
IBCS2_SIGPOLL, /* 23 */
0, /* 24 - SIGXCPU */
0, /* 25 - SIGXFSZ */
IBCS2_SIGVTALRM, /* 26 */
IBCS2_SIGPROF, /* 27 */
IBCS2_SIGWINCH, /* 28 */
0, /* 29 */
IBCS2_SIGUSR1, /* 30 */
IBCS2_SIGUSR2, /* 31 */
};
int ibcs2_to_bsd_sig[] = {
0, /* 0 */
SIGHUP, /* 1 */ SIGHUP, /* 1 */
SIGINT, /* 2 */ SIGINT, /* 2 */
SIGQUIT, /* 3 */ SIGQUIT, /* 3 */
@ -67,10 +114,10 @@ static int ibcs2bsd_sigtbl[IBCS2_NSIG] = {
SIGUSR1, /* 16 */ SIGUSR1, /* 16 */
SIGUSR2, /* 17 */ SIGUSR2, /* 17 */
SIGCHLD, /* 18 */ SIGCHLD, /* 18 */
NOSIG, /* 19 - SIGPWR */ 0, /* 19 - SIGPWR */
SIGWINCH, /* 20 */ SIGWINCH, /* 20 */
NOSIG, /* 21 */ 0, /* 21 */
NOSIG, /* 22 - SIGPOLL */ SIGIO, /* 22 */
SIGSTOP, /* 23 */ SIGSTOP, /* 23 */
SIGTSTP, /* 24 */ SIGTSTP, /* 24 */
SIGCONT, /* 25 */ SIGCONT, /* 25 */
@ -78,112 +125,139 @@ static int ibcs2bsd_sigtbl[IBCS2_NSIG] = {
SIGTTOU, /* 27 */ SIGTTOU, /* 27 */
SIGVTALRM, /* 28 */ SIGVTALRM, /* 28 */
SIGPROF, /* 29 */ SIGPROF, /* 29 */
NOSIG, /* 30 */ 0, /* 30 */
NOSIG, /* 31 */ 0, /* 31 */
}; };
static int bsd2ibcs_sigtbl[NSIG] = { void
NOSIG, /* 0 */ ibcs2_to_bsd_sigset(iss, bss)
IBCS2_SIGHUP, /* 1 */ const ibcs2_sigset_t *iss;
IBCS2_SIGINT, /* 2 */ sigset_t *bss;
IBCS2_SIGQUIT, /* 3 */
IBCS2_SIGILL, /* 4 */
IBCS2_SIGTRAP, /* 5 */
IBCS2_SIGABRT, /* 6 */
IBCS2_SIGEMT, /* 7 */
IBCS2_SIGFPE, /* 8 */
IBCS2_SIGKILL, /* 9 */
IBCS2_SIGBUS, /* 10 */
IBCS2_SIGSEGV, /* 11 */
IBCS2_SIGSYS, /* 12 */
IBCS2_SIGPIPE, /* 13 */
IBCS2_SIGALRM, /* 14 */
IBCS2_SIGTERM, /* 15 */
NOSIG, /* 16 */
IBCS2_SIGSTOP, /* 17 */
IBCS2_SIGTSTP, /* 18 */
IBCS2_SIGCONT, /* 19 */
IBCS2_SIGCLD, /* 20 */
IBCS2_SIGTTIN, /* 21 */
IBCS2_SIGTTOU, /* 22 */
NOSIG, /* 23 */
NOSIG, /* 24 */
NOSIG, /* 25 */
IBCS2_SIGVTALRM, /* 26 */
IBCS2_SIGPROF, /* 27 */
IBCS2_SIGWINCH, /* 28 */
NOSIG, /* 29 */
IBCS2_SIGUSR1, /* 30 */
IBCS2_SIGUSR2, /* 31 */
};
static int
ibcs2bsd_sig(sig)
int sig;
{ {
if (sig < 1 || sig >= IBCS2_NSIG) int i, newsig;
return NOSIG;
else sigemptyset(bss);
return ibcs2bsd_sigtbl[sig]; for (i = 1; i < IBCS2_NSIG; i++) {
if (ibcs2_sigismember(iss, i)) {
newsig = ibcs2_to_bsd_sig[i];
if (newsig)
sigaddset(bss, newsig);
}
}
}
void
bsd_to_ibcs2_sigset(bss, iss)
const sigset_t *bss;
ibcs2_sigset_t *iss;
{
int i, newsig;
ibcs2_sigemptyset(iss);
for (i = 1; i < NSIG; i++) {
if (sigismember(bss, i)) {
newsig = bsd_to_ibcs2_sig[i];
if (newsig)
ibcs2_sigaddset(iss, newsig);
}
}
}
void
ibcs2_to_bsd_sigaction(isa, bsa)
struct ibcs2_sigaction *isa;
struct sigaction *bsa;
{
bsa->sa_handler = isa->sa_handler;
ibcs2_to_bsd_sigset(&isa->sa_mask, &bsa->sa_mask);
bsa->sa_flags = 0;
if ((isa->sa_flags & IBCS2_SA_NOCLDSTOP) != 0)
bsa->sa_flags |= SA_NOCLDSTOP;
}
void
bsd_to_ibcs2_sigaction(bsa, isa)
struct sigaction *bsa;
struct ibcs2_sigaction *isa;
{
isa->sa_handler = bsa->sa_handler;
bsd_to_ibcs2_sigset(&bsa->sa_mask, &isa->sa_mask);
isa->sa_flags = 0;
if ((bsa->sa_flags & SA_NOCLDSTOP) != 0)
isa->sa_flags |= SA_NOCLDSTOP;
} }
int int
bsd2ibcs_sig(sig) ibcs2_sigaction(p, uap, retval)
int sig; register struct proc *p;
struct ibcs2_sigaction_args /* {
syscallarg(int) sig;
syscallarg(struct ibcs2_sigaction *) act;
syscallarg(struct ibcs2_sigaction *) oact;
} */ *uap;
register_t *retval;
{ {
if (sig < 1 || sig >= NSIG) struct ibcs2_sigaction *nisa, *oisa, tmpisa;
return NOSIG; struct sigaction *nbsa, *obsa, tmpbsa;
struct sigaction_args sa;
caddr_t sg;
int error;
sg = stackgap_init(p->p_emul);
nisa = SCARG(uap, act);
oisa = SCARG(uap, oact);
if (oisa != NULL)
obsa = stackgap_alloc(&sg, sizeof(struct sigaction));
else else
return bsd2ibcs_sigtbl[sig]; obsa = NULL;
}
static sigset_t if (nisa != NULL) {
cvt_sigmask(mask, sigtbl) nbsa = stackgap_alloc(&sg, sizeof(struct sigaction));
sigset_t mask; if ((error = copyin(nisa, &tmpisa, sizeof(tmpisa))) != 0)
int sigtbl[]; return error;
{ ibcs2_to_bsd_sigaction(&tmpisa, &tmpbsa);
int i, newmask; if ((error = copyout(&tmpbsa, nbsa, sizeof(tmpbsa))) != 0)
return error;
} else
nbsa = NULL;
for (i = 0, newmask = 0; i < NSIG; i++) SCARG(&sa, signum) = ibcs2_to_bsd_sig[SCARG(uap, sig)];
if ((sigtbl[i] != NOSIG) && (mask & (1 << i))) SCARG(&sa, nsa) = nbsa;
newmask |= (1 << (sigtbl[i] - 1)); SCARG(&sa, osa) = obsa;
return newmask;
}
static void if ((error = sigaction(p, &sa, retval)) != 0)
cvt_sa2isa(sap, isap) return error;
struct sigaction *sap;
struct ibcs2_sigaction *isap;
{
isap->sa_handler = sap->sa_handler;
isap->sa_mask = cvt_sigmask(sap->sa_mask, bsd2ibcs_sigtbl);
isap->sa_flags = (sap->sa_flags & SA_NOCLDSTOP)
? IBCS2_SA_NOCLDSTOP : 0;
}
static void if (oisa != NULL) {
cvt_isa2sa(isap, sap) if ((error = copyin(obsa, &tmpbsa, sizeof(tmpbsa))) != 0)
struct ibcs2_sigaction *isap; return error;
struct sigaction *sap; bsd_to_ibcs2_sigaction(&tmpbsa, &tmpisa);
{ if ((error = copyout(&tmpisa, oisa, sizeof(tmpisa))) != 0)
sap->sa_handler = isap->sa_handler; return error;
sap->sa_mask = cvt_sigmask(isap->sa_mask, ibcs2bsd_sigtbl); }
sap->sa_flags = (isap->sa_flags & IBCS2_SA_NOCLDSTOP)
? SA_NOCLDSTOP : 0; return 0;
} }
int int
ibcs2_sigsys(p, uap, retval) ibcs2_sigsys(p, uap, retval)
struct proc *p; register struct proc *p;
struct ibcs2_sigsys_args *uap; struct ibcs2_sigsys_args /* {
int *retval; syscallarg(int) sig;
syscallarg(ibcs2_sig_t) fp;
} */ *uap;
register_t *retval;
{ {
int signum = ibcs2_to_bsd_sig[IBCS2_SIGNO(SCARG(uap, sig))];
int error; int error;
int nsig = ibcs2bsd_sig(IBCS2_SIGNO(SCARG(uap, sig))); caddr_t sg = stackgap_init(p->p_emul);
if (nsig == NOSIG) { if (signum <= 0 || signum >= IBCS2_NSIG) {
if (IBCS2_SIGCALL(SCARG(uap, sig)) == IBCS2_SIGNAL_MASK if (IBCS2_SIGCALL(SCARG(uap, sig)) == IBCS2_SIGNAL_MASK ||
|| IBCS2_SIGCALL(SCARG(uap, sig)) == IBCS2_SIGSET_MASK) IBCS2_SIGCALL(SCARG(uap, sig)) == IBCS2_SIGSET_MASK)
*retval = (int)IBCS2_SIG_ERR; *retval = (int)IBCS2_SIG_ERR;
return EINVAL; return EINVAL;
} }
@ -194,40 +268,49 @@ ibcs2_sigsys(p, uap, retval)
* an action. * an action.
*/ */
case IBCS2_SIGSET_MASK: case IBCS2_SIGSET_MASK:
/*
* sigset is identical to signal() except
* that SIG_HOLD is allowed as
* an action.
*/
if (SCARG(uap, fp) == IBCS2_SIG_HOLD) { if (SCARG(uap, fp) == IBCS2_SIG_HOLD) {
struct sigprocmask_args sa; struct sigprocmask_args sa;
SCARG(&sa, how) = SIG_BLOCK; SCARG(&sa, how) = SIG_BLOCK;
SCARG(&sa, mask) = sigmask(nsig); SCARG(&sa, mask) = sigmask(signum);
return sigprocmask(p, &sa, retval); return sigprocmask(p, &sa, retval);
} }
/* else fall through */ /* FALLTHROUGH */
case IBCS2_SIGNAL_MASK: case IBCS2_SIGNAL_MASK:
{ {
struct sigaction *sap, *osap;
struct sigaction_args sa_args; struct sigaction_args sa_args;
caddr_t sg = stackgap_init(p->p_emul); struct sigaction *nbsa, *obsa, sa;
sap = stackgap_alloc(&sg, sizeof(*sap));
osap = stackgap_alloc(&sg, sizeof(*sap)); nbsa = stackgap_alloc(&sg, sizeof(struct sigaction));
sap->sa_handler = SCARG(uap, fp); obsa = stackgap_alloc(&sg, sizeof(struct sigaction));
sap->sa_mask = (sigset_t)0; SCARG(&sa_args, signum) = signum;
sap->sa_flags = 0; SCARG(&sa_args, nsa) = nbsa;
SCARG(&sa_args, osa) = obsa;
sa.sa_handler = SCARG(uap, fp);
sigemptyset(&sa.sa_mask);
sa.sa_flags = 0;
#if 0 #if 0
if (SCARG(&sa_args, sig) != SIGALRM) if (signum != SIGALRM)
sap->sa_flags = SA_RESTART; sa.sa_flags = SA_RESTART;
#endif #endif
SCARG(&sa_args, signum) = nsig; if ((error = copyout(&sa, nbsa, sizeof(sa))) != 0)
SCARG(&sa_args, nsa) = sap; return error;
SCARG(&sa_args, osa) = osap; if ((error = sigaction(p, &sa_args, retval)) != 0) {
error = sigaction(p, &sa_args, retval);
if (error) {
DPRINTF(("signal: sigaction failed: %d\n", DPRINTF(("signal: sigaction failed: %d\n",
error)); error));
*retval = (int)IBCS2_SIG_ERR; *retval = (int)IBCS2_SIG_ERR;
return error; return error;
} }
*retval = (int)SCARG(&sa_args, osa)->sa_handler; if ((error = copyin(obsa, &sa, sizeof(sa))) != 0)
return error;
*retval = (int)sa.sa_handler;
return 0; return 0;
} }
@ -235,8 +318,8 @@ ibcs2_sigsys(p, uap, retval)
{ {
struct sigprocmask_args sa; struct sigprocmask_args sa;
sa.how = SIG_BLOCK; SCARG(&sa, how) = SIG_BLOCK;
sa.mask = sigmask(nsig); SCARG(&sa, mask) = sigmask(signum);
return sigprocmask(p, &sa, retval); return sigprocmask(p, &sa, retval);
} }
@ -244,26 +327,27 @@ ibcs2_sigsys(p, uap, retval)
{ {
struct sigprocmask_args sa; struct sigprocmask_args sa;
sa.how = SIG_UNBLOCK; SCARG(&sa, how) = SIG_UNBLOCK;
sa.mask = sigmask(nsig); SCARG(&sa, mask) = sigmask(signum);
return sigprocmask(p, &sa, retval); return sigprocmask(p, &sa, retval);
} }
case IBCS2_SIGIGNORE_MASK: case IBCS2_SIGIGNORE_MASK:
{ {
struct sigaction *sap;
struct sigaction_args sa_args; struct sigaction_args sa_args;
caddr_t sg = stackgap_init(p->p_emul); struct sigaction *bsa, sa;
sap = stackgap_alloc(&sg, sizeof(*sap)); bsa = stackgap_alloc(&sg, sizeof(struct sigaction));
sap->sa_handler = SIG_IGN; SCARG(&sa_args, signum) = signum;
sap->sa_mask = (sigset_t)0; SCARG(&sa_args, nsa) = bsa;
sap->sa_flags = 0;
SCARG(&sa_args, signum) = nsig;
SCARG(&sa_args, nsa) = sap;
SCARG(&sa_args, osa) = NULL; SCARG(&sa_args, osa) = NULL;
error = sigaction(p, &sa_args, retval);
if (error) { sa.sa_handler = SIG_IGN;
sigemptyset(&sa.sa_mask);
sa.sa_flags = 0;
if ((error = copyout(&sa, bsa, sizeof(sa))) != 0)
return error;
if ((error = sigaction(p, &sa_args, retval)) != 0) {
DPRINTF(("sigignore: sigaction failed\n")); DPRINTF(("sigignore: sigaction failed\n"));
return error; return error;
} }
@ -273,7 +357,8 @@ ibcs2_sigsys(p, uap, retval)
case IBCS2_SIGPAUSE_MASK: case IBCS2_SIGPAUSE_MASK:
{ {
struct sigsuspend_args sa; struct sigsuspend_args sa;
SCARG(&sa, mask) = p->p_sigmask &~ sigmask(nsig);
SCARG(&sa, mask) = p->p_sigmask &~ sigmask(signum);
return sigsuspend(p, &sa, retval); return sigsuspend(p, &sa, retval);
} }
@ -282,126 +367,124 @@ ibcs2_sigsys(p, uap, retval)
} }
} }
int
ibcs2_sigaction(p, uap, retval)
struct proc *p;
struct ibcs2_sigaction_args *uap;
int *retval;
{
int error;
struct sigaction_args sa;
struct ibcs2_sigaction *isa, *oisa;
caddr_t sg = stackgap_init(p->p_emul);
isa = stackgap_alloc(&sg, sizeof(*isa));
oisa = stackgap_alloc(&sg, sizeof(*oisa));
SCARG(&sa, signum) = ibcs2bsd_sig(SCARG(uap, sig));
SCARG(&sa, nsa) = stackgap_alloc(&sg, sizeof(*SCARG(&sa, nsa)));
SCARG(&sa, osa) = stackgap_alloc(&sg, sizeof(*SCARG(&sa, osa)));
if (error = copyin((caddr_t)SCARG(uap, act), (caddr_t)isa,
sizeof(*isa)))
return error;
cvt_isa2sa(isa, SCARG(&sa, nsa));
if (error = sigaction(p, &sa, retval))
return error;
cvt_sa2isa(SCARG(&sa, osa), oisa);
return copyout((caddr_t)oisa, (caddr_t)SCARG(uap, oact), sizeof(*oisa));
}
int int
ibcs2_sigprocmask(p, uap, retval) ibcs2_sigprocmask(p, uap, retval)
struct proc *p; register struct proc *p;
struct ibcs2_sigprocmask_args *uap; struct ibcs2_sigprocmask_args /* {
int *retval; syscallarg(int) how;
syscallarg(ibcs2_sigset_t *) set;
syscallarg(ibcs2_sigset_t *) oset;
} */ *uap;
register_t *retval;
{ {
int error; ibcs2_sigset_t iss;
sigset_t iset; sigset_t bss;
struct sigprocmask_args sa; int error = 0;
if (SCARG(uap, set)) { if (SCARG(uap, oset) != NULL) {
switch (SCARG(uap, how)) { /* Fix the return value first if needed */
case IBCS2_SIG_BLOCK: bsd_to_ibcs2_sigset(&p->p_sigmask, &iss);
SCARG(&sa, how) = SIG_BLOCK; if ((error = copyout(&iss, SCARG(uap, oset), sizeof(iss))) != 0)
break;
case IBCS2_SIG_UNBLOCK:
SCARG(&sa, how) = SIG_UNBLOCK;
break;
case IBCS2_SIG_SETMASK:
SCARG(&sa, how) = SIG_SETMASK;
break;
default:
return EINVAL;
}
if (error = copyin((caddr_t)SCARG(uap, set), (caddr_t)&iset,
sizeof(iset)))
return error; return error;
SCARG(&sa, mask) = cvt_sigmask(iset, ibcs2bsd_sigtbl);
} else {
SCARG(&sa, how) = SIG_BLOCK; /* TODO: CHECK THIS */
SCARG(&sa, mask) = 0;
} }
if (error = sigprocmask(p, &sa, retval))
return error; if (SCARG(uap, set) == NULL)
if (SCARG(uap, oset) == NULL) { /* Just examine */
*retval = 0;
return 0; return 0;
if ((error = copyin(SCARG(uap, set), &iss, sizeof(iss))) != 0)
return error;
ibcs2_to_bsd_sigset(&iss, &bss);
(void) splhigh();
switch (SCARG(uap, how)) {
case IBCS2_SIG_BLOCK:
p->p_sigmask |= bss & ~sigcantmask;
break;
case IBCS2_SIG_UNBLOCK:
p->p_sigmask &= ~bss;
break;
case IBCS2_SIG_SETMASK:
p->p_sigmask = bss & ~sigcantmask;
break;
default:
error = EINVAL;
break;
} }
iset = cvt_sigmask(*retval, bsd2ibcs_sigtbl);
*retval = 0; (void) spl0();
return copyout((caddr_t)&iset, (caddr_t)SCARG(uap, oset),
sizeof(iset)); return error;
} }
int int
ibcs2_sigpending(p, uap, retval) ibcs2_sigpending(p, uap, retval)
struct proc *p; register struct proc *p;
struct ibcs2_sigpending_args *uap; struct ibcs2_sigpending_args /* {
int *retval; syscallarg(ibcs2_sigset_t *) mask;
} */ *uap;
register_t *retval;
{ {
int mask = cvt_sigmask(p->p_siglist & p->p_sigmask, bsd2ibcs_sigtbl); sigset_t bss;
ibcs2_sigset_t iss;
return (copyout((caddr_t)&mask, (caddr_t)SCARG(uap, mask), bss = p->p_siglist & p->p_sigmask;
sizeof(int))); bsd_to_ibcs2_sigset(&bss, &iss);
return copyout(&iss, SCARG(uap, mask), sizeof(iss));
} }
int int
ibcs2_sigsuspend(p, uap, retval) ibcs2_sigsuspend(p, uap, retval)
struct proc *p; register struct proc *p;
struct ibcs2_sigsuspend_args *uap; struct ibcs2_sigsuspend_args /* {
int *retval; syscallarg(ibcs2_sigset_t *) mask;
} */ *uap;
register_t *retval;
{ {
int error; ibcs2_sigset_t sss;
sigset_t bss;
struct sigsuspend_args sa; struct sigsuspend_args sa;
int error;
if (error = copyin((caddr_t)SCARG(uap, mask), (caddr_t)SCARG(&sa, mask), if ((error = copyin(SCARG(uap, mask), &sss, sizeof(sss))) != 0)
sizeof(SCARG(&sa, mask))))
return error; return error;
ibcs2_to_bsd_sigset(&sss, &bss);
SCARG(&sa, mask) = bss;
return sigsuspend(p, &sa, retval); return sigsuspend(p, &sa, retval);
} }
int int
ibcs2_pause(p, uap, retval) ibcs2_pause(p, uap, retval)
struct proc *p; register struct proc *p;
void *uap; void *uap;
int *retval; register_t *retval;
{ {
int error; struct sigsuspend_args bsa;
struct sigsuspend_args sa;
SCARG(&sa, mask) = p->p_sigmask; SCARG(&bsa, mask) = p->p_sigmask;
error = sigsuspend(p, &sa, retval); return sigsuspend(p, &bsa, retval);
return error;
} }
int int
ibcs2_kill(p, uap, retval) ibcs2_kill(p, uap, retval)
struct proc *p; register struct proc *p;
struct ibcs2_kill_args *uap; struct ibcs2_kill_args /* {
int *retval; syscallarg(int) pid;
syscallarg(int) signo;
} */ *uap;
register_t *retval;
{ {
struct kill_args ka;
SCARG(uap, signo) = ibcs2bsd_sig(SCARG(uap, signo)); SCARG(&ka, pid) = SCARG(uap, pid);
if (SCARG(uap, signo) == NOSIG) SCARG(&ka, signum) = ibcs2_to_bsd_sig[SCARG(uap, signo)];
return EINVAL; return kill(p, &ka, retval);
return kill(p, uap, retval);
} }