rename: s/sa_/<compat>sa/g
This commit is contained in:
parent
daa59d8957
commit
116bcb05d0
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: kern_sig_13.c,v 1.7 2002/07/04 23:32:09 thorpej Exp $ */
|
||||
/* $NetBSD: kern_sig_13.c,v 1.8 2002/11/26 18:43:20 christos Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1998 The NetBSD Foundation, Inc.
|
||||
|
@ -37,7 +37,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: kern_sig_13.c,v 1.7 2002/07/04 23:32:09 thorpej Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: kern_sig_13.c,v 1.8 2002/11/26 18:43:20 christos Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/proc.h>
|
||||
|
@ -79,9 +79,9 @@ native_sigaction13_to_sigaction(osa, sa)
|
|||
struct sigaction *sa;
|
||||
{
|
||||
|
||||
sa->sa_handler = osa->sa_handler;
|
||||
native_sigset13_to_sigset(&osa->sa_mask, &sa->sa_mask);
|
||||
sa->sa_flags = osa->sa_flags;
|
||||
sa->sa_handler = osa->osa_handler;
|
||||
native_sigset13_to_sigset(&osa->osa_mask, &sa->sa_mask);
|
||||
sa->sa_flags = osa->osa_flags;
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -90,9 +90,9 @@ native_sigaction_to_sigaction13(sa, osa)
|
|||
struct sigaction13 *osa;
|
||||
{
|
||||
|
||||
osa->sa_handler = sa->sa_handler;
|
||||
native_sigset_to_sigset13(&sa->sa_mask, &osa->sa_mask);
|
||||
osa->sa_flags = sa->sa_flags;
|
||||
osa->osa_handler = sa->sa_handler;
|
||||
native_sigset_to_sigset13(&sa->sa_mask, &osa->osa_mask);
|
||||
osa->osa_flags = sa->sa_flags;
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: freebsd_misc.c,v 1.15 2002/07/04 23:32:09 thorpej Exp $ */
|
||||
/* $NetBSD: freebsd_misc.c,v 1.16 2002/11/26 18:43:20 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995 Frank van der Linden
|
||||
|
@ -36,7 +36,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: freebsd_misc.c,v 1.15 2002/07/04 23:32:09 thorpej Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: freebsd_misc.c,v 1.16 2002/11/26 18:43:20 christos Exp $");
|
||||
|
||||
#if defined(_KERNEL_OPT)
|
||||
#include "opt_ntp.h"
|
||||
|
@ -141,9 +141,9 @@ freebsd_sys_sigaction4(p, v, retval)
|
|||
error = copyin(SCARG(uap, nsa), &nesa, sizeof(nesa));
|
||||
if (error)
|
||||
return (error);
|
||||
nbsa.sa_handler = nesa.sa_handler;
|
||||
nbsa.sa_mask = nesa.sa_mask;
|
||||
nbsa.sa_flags = nesa.sa_flags;
|
||||
nbsa.sa_handler = nesa.freebsd_sa_handler;
|
||||
nbsa.sa_mask = nesa.freebsd_sa_mask;
|
||||
nbsa.sa_flags = nesa.freebsd_sa_flags;
|
||||
}
|
||||
error = sigaction1(p, SCARG(uap, signum),
|
||||
SCARG(uap, nsa) ? &nbsa : 0, SCARG(uap, osa) ? &obsa : 0,
|
||||
|
@ -151,9 +151,9 @@ freebsd_sys_sigaction4(p, v, retval)
|
|||
if (error)
|
||||
return (error);
|
||||
if (SCARG(uap, osa)) {
|
||||
oesa.sa_handler = obsa.sa_handler;
|
||||
oesa.sa_mask = obsa.sa_mask;
|
||||
oesa.sa_flags = obsa.sa_flags;
|
||||
oesa.freebsd_sa_handler = obsa.sa_handler;
|
||||
oesa.freebsd_sa_mask = obsa.sa_mask;
|
||||
oesa.freebsd_sa_flags = obsa.sa_flags;
|
||||
error = copyout(&oesa, SCARG(uap, osa), sizeof(oesa));
|
||||
if (error)
|
||||
return (error);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: freebsd_signal.h,v 1.1 2000/07/18 14:15:05 onoe Exp $ */
|
||||
/* $NetBSD: freebsd_signal.h,v 1.2 2002/11/26 18:43:20 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2000 Atsushi Onoe
|
||||
|
@ -36,9 +36,9 @@
|
|||
#define _FREEBSD_SIG_H
|
||||
|
||||
struct freebsd_sigaction4 {
|
||||
void (*sa_handler) __P((int)); /* signal handler */
|
||||
int sa_flags; /* see signal options below */
|
||||
sigset_t sa_mask; /* signal mask to apply */
|
||||
void (*freebsd_sa_handler) __P((int)); /* signal handler */
|
||||
int freebsd_sa_flags; /* see signal options below */
|
||||
sigset_t freebsd_sa_mask; /* signal mask to apply */
|
||||
};
|
||||
|
||||
#endif /* _FREEBSD_SIG_H */
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ibcs2_signal.c,v 1.16 2002/07/04 23:32:09 thorpej Exp $ */
|
||||
/* $NetBSD: ibcs2_signal.c,v 1.17 2002/11/26 18:43:20 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995 Scott Bartram
|
||||
|
@ -28,7 +28,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: ibcs2_signal.c,v 1.16 2002/07/04 23:32:09 thorpej Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: ibcs2_signal.c,v 1.17 2002/11/26 18:43:20 christos Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
@ -102,24 +102,24 @@ ibcs2_to_native_sigaction(isa, bsa)
|
|||
struct sigaction *bsa;
|
||||
{
|
||||
|
||||
bsa->sa_handler = isa->sa_handler;
|
||||
ibcs2_to_native_sigset(&isa->sa_mask, &bsa->sa_mask);
|
||||
bsa->sa_handler = isa->ibcs2_sa_handler;
|
||||
ibcs2_to_native_sigset(&isa->ibcs2_sa_mask, &bsa->sa_mask);
|
||||
bsa->sa_flags = 0;
|
||||
if ((isa->sa_flags & IBCS2_SA_NOCLDSTOP) != 0)
|
||||
if ((isa->ibcs2_sa_flags & IBCS2_SA_NOCLDSTOP) != 0)
|
||||
bsa->sa_flags |= SA_NOCLDSTOP;
|
||||
if ((isa->sa_flags & IBCS2_SA_RESETHAND) != 0)
|
||||
if ((isa->ibcs2_sa_flags & IBCS2_SA_RESETHAND) != 0)
|
||||
bsa->sa_flags |= SA_RESETHAND;
|
||||
if ((isa->sa_flags & IBCS2_SA_RESTART) != 0)
|
||||
if ((isa->ibcs2_sa_flags & IBCS2_SA_RESTART) != 0)
|
||||
bsa->sa_flags |= SA_RESTART;
|
||||
if ((isa->sa_flags & IBCS2_SA_SIGINFO) != 0)
|
||||
if ((isa->ibcs2_sa_flags & IBCS2_SA_SIGINFO) != 0)
|
||||
/*XXX*/ printf("ibcs2_to_native_sigaction: SA_SIGINFO ignored\n");
|
||||
if ((isa->sa_flags & IBCS2_SA_NODEFER) != 0)
|
||||
if ((isa->ibcs2_sa_flags & IBCS2_SA_NODEFER) != 0)
|
||||
bsa->sa_flags |= SA_NODEFER;
|
||||
if ((isa->sa_flags & IBCS2_SA_ONSTACK) != 0)
|
||||
if ((isa->ibcs2_sa_flags & IBCS2_SA_ONSTACK) != 0)
|
||||
bsa->sa_flags |= SA_ONSTACK;
|
||||
if ((isa->sa_flags & IBCS2_SA_NOCLDWAIT) != 0)
|
||||
if ((isa->ibcs2_sa_flags & IBCS2_SA_NOCLDWAIT) != 0)
|
||||
/*XXX*/ printf("ibcs2_to_native_sigaction: SA_NOCLDWAIT ignored\n");
|
||||
if ((isa->sa_flags & ~IBCS2_SA_ALLBITS) != 0)
|
||||
if ((isa->ibcs2_sa_flags & ~IBCS2_SA_ALLBITS) != 0)
|
||||
/*XXX*/ printf("ibcs2_to_native_sigaction: extra bits ignored\n");
|
||||
}
|
||||
|
||||
|
@ -129,19 +129,19 @@ native_to_ibcs2_sigaction(bsa, isa)
|
|||
struct ibcs2_sigaction *isa;
|
||||
{
|
||||
|
||||
isa->sa_handler = bsa->sa_handler;
|
||||
native_to_ibcs2_sigset(&bsa->sa_mask, &isa->sa_mask);
|
||||
isa->sa_flags = 0;
|
||||
isa->ibcs2_sa_handler = bsa->sa_handler;
|
||||
native_to_ibcs2_sigset(&bsa->sa_mask, &isa->ibcs2_sa_mask);
|
||||
isa->ibcs2_sa_flags = 0;
|
||||
if ((bsa->sa_flags & SA_NOCLDSTOP) != 0)
|
||||
isa->sa_flags |= IBCS2_SA_NOCLDSTOP;
|
||||
isa->ibcs2_sa_flags |= IBCS2_SA_NOCLDSTOP;
|
||||
if ((bsa->sa_flags & SA_RESETHAND) != 0)
|
||||
isa->sa_flags |= IBCS2_SA_RESETHAND;
|
||||
isa->ibcs2_sa_flags |= IBCS2_SA_RESETHAND;
|
||||
if ((bsa->sa_flags & SA_RESTART) != 0)
|
||||
isa->sa_flags |= IBCS2_SA_RESTART;
|
||||
isa->ibcs2_sa_flags |= IBCS2_SA_RESTART;
|
||||
if ((bsa->sa_flags & SA_NODEFER) != 0)
|
||||
isa->sa_flags |= IBCS2_SA_NODEFER;
|
||||
isa->ibcs2_sa_flags |= IBCS2_SA_NODEFER;
|
||||
if ((bsa->sa_flags & SA_ONSTACK) != 0)
|
||||
isa->sa_flags |= IBCS2_SA_ONSTACK;
|
||||
isa->ibcs2_sa_flags |= IBCS2_SA_ONSTACK;
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ibcs2_signal.h,v 1.11 2002/03/31 22:22:44 christos Exp $ */
|
||||
/* $NetBSD: ibcs2_signal.h,v 1.12 2002/11/26 18:43:20 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994, 1995 Scott Bartram
|
||||
|
@ -95,9 +95,9 @@ typedef long ibcs2_sigset_t;
|
|||
typedef void (*ibcs2_sig_t) __P((int));
|
||||
|
||||
struct ibcs2_sigaction {
|
||||
ibcs2_sig_t sa_handler;
|
||||
ibcs2_sigset_t sa_mask;
|
||||
int sa_flags;
|
||||
ibcs2_sig_t ibcs2_sa_handler;
|
||||
ibcs2_sigset_t ibcs2_sa_mask;
|
||||
int ibcs2_sa_flags;
|
||||
};
|
||||
|
||||
/* sa_flags */
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: linux_signal.h,v 1.3 2002/03/19 20:51:59 christos Exp $ */
|
||||
/* $NetBSD: linux_signal.h,v 1.4 2002/11/26 18:43:20 christos Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1998 The NetBSD Foundation, Inc.
|
||||
|
@ -117,16 +117,16 @@ typedef struct {
|
|||
|
||||
/* aka osf_sigaction in Linux sources. Note absence of sa_restorer */
|
||||
struct linux_old_sigaction {
|
||||
linux_handler_t sa_handler;
|
||||
linux_old_sigset_t sa_mask;
|
||||
int sa_flags;
|
||||
linux_handler_t linux_sa_handler;
|
||||
linux_old_sigset_t linux_sa_mask;
|
||||
int linux_sa_flags;
|
||||
};
|
||||
|
||||
/* Used in rt_* calls */
|
||||
struct linux_sigaction {
|
||||
linux_handler_t sa_handler;
|
||||
u_long sa_flags;
|
||||
linux_sigset_t sa_mask;
|
||||
linux_handler_t linux_sa_handler;
|
||||
u_long linux_sa_flags;
|
||||
linux_sigset_t linux_sa_mask;
|
||||
};
|
||||
|
||||
struct linux_k_sigaction {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: linux_signal.h,v 1.3 2002/03/19 20:51:59 christos Exp $ */
|
||||
/* $NetBSD: linux_signal.h,v 1.4 2002/11/26 18:43:21 christos Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
|
||||
|
@ -105,23 +105,23 @@ typedef struct {
|
|||
} linux_sigset_t;
|
||||
|
||||
struct linux_old_sigaction {
|
||||
linux_handler_t sa_handler;
|
||||
linux_old_sigset_t sa_mask;
|
||||
u_long sa_flags;
|
||||
void (*sa_restorer) __P((void));
|
||||
linux_handler_t linux_sa_handler;
|
||||
linux_old_sigset_t linux_sa_mask;
|
||||
u_long linux_sa_flags;
|
||||
void (*linux_sa_restorer) __P((void));
|
||||
};
|
||||
|
||||
/* Used in rt_* calls */
|
||||
struct linux_sigaction {
|
||||
linux_handler_t sa_handler;
|
||||
u_long sa_flags;
|
||||
void (*sa_restorer) __P((void));
|
||||
linux_sigset_t sa_mask;
|
||||
linux_handler_t linux_sa_handler;
|
||||
u_long linux_sa_flags;
|
||||
void (*linux_sa_restorer) __P((void));
|
||||
linux_sigset_t linux_sa_mask;
|
||||
};
|
||||
|
||||
struct linux_k_sigaction {
|
||||
struct linux_sigaction sa;
|
||||
#define k_sa_restorer sa.sa_restorer
|
||||
#define k_sa_restorer sa.linux_sa_restorer
|
||||
};
|
||||
|
||||
#define LINUX_SS_ONSTACK 1
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: linux_signal.h,v 1.2 2002/03/19 20:51:59 christos Exp $ */
|
||||
/* $NetBSD: linux_signal.h,v 1.3 2002/11/26 18:43:21 christos Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1998 The NetBSD Foundation, Inc.
|
||||
|
@ -116,23 +116,23 @@ typedef struct {
|
|||
} linux_sigset_t;
|
||||
|
||||
struct linux_old_sigaction {
|
||||
linux_handler_t sa_handler;
|
||||
linux_old_sigset_t sa_mask;
|
||||
u_long sa_flags;
|
||||
void (*sa_restorer) __P((void));
|
||||
linux_handler_t linux_sa_handler;
|
||||
linux_old_sigset_t linux_sa_mask;
|
||||
u_long linux_sa_flags;
|
||||
void (*linux_sa_restorer) __P((void));
|
||||
};
|
||||
|
||||
/* Used in rt_* calls */
|
||||
struct linux_sigaction {
|
||||
linux_handler_t sa_handler;
|
||||
u_long sa_flags;
|
||||
void (*sa_restorer) __P((void));
|
||||
linux_sigset_t sa_mask;
|
||||
linux_handler_t linux_sa_handler;
|
||||
u_long linux_sa_flags;
|
||||
void (*linux_sa_restorer) __P((void));
|
||||
linux_sigset_t linux_sa_mask;
|
||||
};
|
||||
|
||||
struct linux_k_sigaction {
|
||||
struct linux_sigaction sa;
|
||||
#define k_sa_restorer sa.sa_restorer
|
||||
#define k_sa_restorer sa.linux_sa_restorer
|
||||
};
|
||||
|
||||
typedef struct linux_sigaltstack {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: linux_signal.h,v 1.7 2002/03/19 20:52:00 christos Exp $ */
|
||||
/* $NetBSD: linux_signal.h,v 1.8 2002/11/26 18:43:21 christos Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1995, 1998, 2001 The NetBSD Foundation, Inc.
|
||||
|
@ -130,11 +130,11 @@ typedef struct {
|
|||
|
||||
/* Used in rt_* calls. No old_sigaction is defined for MIPS */
|
||||
struct linux_sigaction {
|
||||
unsigned int sa_flags;
|
||||
linux___sighandler_t sa_handler;
|
||||
linux_sigset_t sa_mask;
|
||||
void (*sa_restorer) __P((void));
|
||||
int sa_resv[1];
|
||||
unsigned int linux_sa_flags;
|
||||
linux___sighandler_t linux_sa_handler;
|
||||
linux_sigset_t linux_sa_mask;
|
||||
void (*linux_sa_restorer) __P((void));
|
||||
int linux_sa_resv[1];
|
||||
};
|
||||
|
||||
struct linux_k_sigaction {
|
||||
|
@ -142,11 +142,11 @@ struct linux_k_sigaction {
|
|||
};
|
||||
|
||||
struct linux_old_sigaction {
|
||||
unsigned int sa_flags;
|
||||
linux___sighandler_t sa_handler;
|
||||
linux_old_sigset_t sa_mask;
|
||||
void (*sa_restorer) __P((void));
|
||||
int sa_resv[1];
|
||||
unsigned int linux_sa_flags;
|
||||
linux___sighandler_t linux_sa_handler;
|
||||
linux_old_sigset_t linux_sa_mask;
|
||||
void (*linux_sa_restorer) __P((void));
|
||||
int linux_sa_resv[1];
|
||||
};
|
||||
|
||||
#define LINUX_SS_ONSTACK 1
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: linux_signal.h,v 1.4 2002/03/19 20:52:00 christos Exp $ */
|
||||
/* $NetBSD: linux_signal.h,v 1.5 2002/11/26 18:43:21 christos Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1995, 1998, 2001 The NetBSD Foundation, Inc.
|
||||
|
@ -112,18 +112,18 @@ typedef struct {
|
|||
} linux_sigset_t;
|
||||
|
||||
struct linux_old_sigaction {
|
||||
linux_handler_t sa_handler;
|
||||
linux_old_sigset_t sa_mask;
|
||||
unsigned long sa_flags;
|
||||
void (*sa_restorer) __P((void));
|
||||
linux_handler_t linux_sa_handler;
|
||||
linux_old_sigset_t linux_sa_mask;
|
||||
unsigned long linux_sa_flags;
|
||||
void (*linux_sa_restorer) __P((void));
|
||||
};
|
||||
|
||||
/* Used in rt_* calls */
|
||||
struct linux_sigaction {
|
||||
linux_handler_t sa_handler;
|
||||
unsigned long sa_flags;
|
||||
void (*sa_restorer) __P((void));
|
||||
linux_sigset_t sa_mask;
|
||||
linux_handler_t linux_sa_handler;
|
||||
unsigned long linux_sa_flags;
|
||||
void (*linux_sa_restorer) __P((void));
|
||||
linux_sigset_t linux_sa_mask;
|
||||
};
|
||||
|
||||
struct linux_k_sigaction {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: linux_signal.c,v 1.38 2002/07/04 23:32:12 thorpej Exp $ */
|
||||
/* $NetBSD: linux_signal.c,v 1.39 2002/11/26 18:43:21 christos Exp $ */
|
||||
/*-
|
||||
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
|
||||
* All rights reserved.
|
||||
|
@ -54,7 +54,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: linux_signal.c,v 1.38 2002/07/04 23:32:12 thorpej Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: linux_signal.c,v 1.39 2002/11/26 18:43:21 christos Exp $");
|
||||
|
||||
#define COMPAT_LINUX 1
|
||||
|
||||
|
@ -225,14 +225,14 @@ linux_old_to_native_sigaction(bsa, lsa)
|
|||
struct sigaction *bsa;
|
||||
const struct linux_old_sigaction *lsa;
|
||||
{
|
||||
bsa->sa_handler = lsa->sa_handler;
|
||||
linux_old_to_native_sigset(&bsa->sa_mask, &lsa->sa_mask);
|
||||
bsa->sa_flags = linux_to_native_sigflags(lsa->sa_flags);
|
||||
bsa->sa_handler = lsa->linux_sa_handler;
|
||||
linux_old_to_native_sigset(&bsa->sa_mask, &lsa->linux_sa_mask);
|
||||
bsa->sa_flags = linux_to_native_sigflags(lsa->linux_sa_flags);
|
||||
#ifndef __alpha__
|
||||
/*
|
||||
* XXX: On the alpha sa_restorer is elsewhere.
|
||||
*/
|
||||
if (lsa->sa_restorer != NULL)
|
||||
if (lsa->linux_sa_restorer != NULL)
|
||||
DPRINTF(("linux_old_to_native_sigaction: "
|
||||
"sa_restorer ignored\n"));
|
||||
#endif
|
||||
|
@ -243,11 +243,11 @@ native_to_linux_old_sigaction(lsa, bsa)
|
|||
struct linux_old_sigaction *lsa;
|
||||
const struct sigaction *bsa;
|
||||
{
|
||||
lsa->sa_handler = bsa->sa_handler;
|
||||
native_to_linux_old_sigset(&lsa->sa_mask, &bsa->sa_mask);
|
||||
lsa->sa_flags = native_to_linux_sigflags(bsa->sa_flags);
|
||||
lsa->linux_sa_handler = bsa->sa_handler;
|
||||
native_to_linux_old_sigset(&lsa->linux_sa_mask, &bsa->sa_mask);
|
||||
lsa->linux_sa_flags = native_to_linux_sigflags(bsa->sa_flags);
|
||||
#ifndef __alpha__
|
||||
lsa->sa_restorer = NULL;
|
||||
lsa->linux_sa_restorer = NULL;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -257,11 +257,11 @@ linux_to_native_sigaction(bsa, lsa)
|
|||
struct sigaction *bsa;
|
||||
const struct linux_sigaction *lsa;
|
||||
{
|
||||
bsa->sa_handler = lsa->sa_handler;
|
||||
linux_to_native_sigset(&bsa->sa_mask, &lsa->sa_mask);
|
||||
bsa->sa_flags = linux_to_native_sigflags(lsa->sa_flags);
|
||||
bsa->sa_handler = lsa->linux_sa_handler;
|
||||
linux_to_native_sigset(&bsa->sa_mask, &lsa->linux_sa_mask);
|
||||
bsa->sa_flags = linux_to_native_sigflags(lsa->linux_sa_flags);
|
||||
#ifndef __alpha__
|
||||
if (lsa->sa_restorer != 0)
|
||||
if (lsa->linux_sa_restorer != 0)
|
||||
DPRINTF(("linux_to_native_sigaction: sa_restorer ignored\n"));
|
||||
#endif
|
||||
}
|
||||
|
@ -271,11 +271,11 @@ native_to_linux_sigaction(lsa, bsa)
|
|||
struct linux_sigaction *lsa;
|
||||
const struct sigaction *bsa;
|
||||
{
|
||||
lsa->sa_handler = bsa->sa_handler;
|
||||
native_to_linux_sigset(&lsa->sa_mask, &bsa->sa_mask);
|
||||
lsa->sa_flags = native_to_linux_sigflags(bsa->sa_flags);
|
||||
lsa->linux_sa_handler = bsa->sa_handler;
|
||||
native_to_linux_sigset(&lsa->linux_sa_mask, &bsa->sa_mask);
|
||||
lsa->linux_sa_flags = native_to_linux_sigflags(bsa->sa_flags);
|
||||
#ifndef __alpha__
|
||||
lsa->sa_restorer = NULL;
|
||||
lsa->linux_sa_restorer = NULL;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: svr4_signal.c,v 1.47 2002/09/23 05:51:18 simonb Exp $ */
|
||||
/* $NetBSD: svr4_signal.c,v 1.48 2002/11/26 18:43:22 christos Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1994, 1998 The NetBSD Foundation, Inc.
|
||||
|
@ -37,7 +37,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: svr4_signal.c,v 1.47 2002/09/23 05:51:18 simonb Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: svr4_signal.c,v 1.48 2002/11/26 18:43:22 christos Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
@ -133,26 +133,26 @@ svr4_to_native_sigaction(ssa, bsa)
|
|||
struct sigaction *bsa;
|
||||
{
|
||||
|
||||
bsa->sa_handler = (sig_t) ssa->sa_handler;
|
||||
svr4_to_native_sigset(&ssa->sa_mask, &bsa->sa_mask);
|
||||
bsa->sa_handler = (sig_t) ssa->svr4_sa_handler;
|
||||
svr4_to_native_sigset(&ssa->svr4_sa_mask, &bsa->sa_mask);
|
||||
bsa->sa_flags = 0;
|
||||
if ((ssa->sa_flags & SVR4_SA_ONSTACK) != 0)
|
||||
if ((ssa->svr4_sa_flags & SVR4_SA_ONSTACK) != 0)
|
||||
bsa->sa_flags |= SA_ONSTACK;
|
||||
if ((ssa->sa_flags & SVR4_SA_RESETHAND) != 0)
|
||||
if ((ssa->svr4_sa_flags & SVR4_SA_RESETHAND) != 0)
|
||||
bsa->sa_flags |= SA_RESETHAND;
|
||||
if ((ssa->sa_flags & SVR4_SA_RESTART) != 0)
|
||||
if ((ssa->svr4_sa_flags & SVR4_SA_RESTART) != 0)
|
||||
bsa->sa_flags |= SA_RESTART;
|
||||
if ((ssa->sa_flags & SVR4_SA_SIGINFO) != 0)
|
||||
if ((ssa->svr4_sa_flags & SVR4_SA_SIGINFO) != 0)
|
||||
bsa->sa_flags |= SA_SIGINFO;
|
||||
if ((ssa->sa_flags & SVR4_SA_NODEFER) != 0)
|
||||
if ((ssa->svr4_sa_flags & SVR4_SA_NODEFER) != 0)
|
||||
bsa->sa_flags |= SA_NODEFER;
|
||||
if ((ssa->sa_flags & SVR4_SA_NOCLDWAIT) != 0)
|
||||
if ((ssa->svr4_sa_flags & SVR4_SA_NOCLDWAIT) != 0)
|
||||
bsa->sa_flags |= SA_NOCLDWAIT;
|
||||
if ((ssa->sa_flags & SVR4_SA_NOCLDSTOP) != 0)
|
||||
if ((ssa->svr4_sa_flags & SVR4_SA_NOCLDSTOP) != 0)
|
||||
bsa->sa_flags |= SA_NOCLDSTOP;
|
||||
if ((ssa->sa_flags & ~SVR4_SA_ALLBITS) != 0)
|
||||
if ((ssa->svr4_sa_flags & ~SVR4_SA_ALLBITS) != 0)
|
||||
DPRINTF(("svr4_to_native_sigaction: extra bits %x ignored\n",
|
||||
ssa->sa_flags & ~SVR4_SA_ALLBITS));
|
||||
ssa->svr4_sa_flags & ~SVR4_SA_ALLBITS));
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -161,19 +161,19 @@ native_to_svr4_sigaction(bsa, ssa)
|
|||
struct svr4_sigaction *ssa;
|
||||
{
|
||||
|
||||
ssa->sa_handler = (svr4_sig_t) bsa->sa_handler;
|
||||
native_to_svr4_sigset(&bsa->sa_mask, &ssa->sa_mask);
|
||||
ssa->sa_flags = 0;
|
||||
ssa->svr4_sa_handler = (svr4_sig_t) bsa->sa_handler;
|
||||
native_to_svr4_sigset(&bsa->sa_mask, &ssa->svr4_sa_mask);
|
||||
ssa->svr4_sa_flags = 0;
|
||||
if ((bsa->sa_flags & SA_ONSTACK) != 0)
|
||||
ssa->sa_flags |= SVR4_SA_ONSTACK;
|
||||
ssa->svr4_sa_flags |= SVR4_SA_ONSTACK;
|
||||
if ((bsa->sa_flags & SA_RESETHAND) != 0)
|
||||
ssa->sa_flags |= SVR4_SA_RESETHAND;
|
||||
ssa->svr4_sa_flags |= SVR4_SA_RESETHAND;
|
||||
if ((bsa->sa_flags & SA_RESTART) != 0)
|
||||
ssa->sa_flags |= SVR4_SA_RESTART;
|
||||
ssa->svr4_sa_flags |= SVR4_SA_RESTART;
|
||||
if ((bsa->sa_flags & SA_NODEFER) != 0)
|
||||
ssa->sa_flags |= SVR4_SA_NODEFER;
|
||||
ssa->svr4_sa_flags |= SVR4_SA_NODEFER;
|
||||
if ((bsa->sa_flags & SA_NOCLDSTOP) != 0)
|
||||
ssa->sa_flags |= SVR4_SA_NOCLDSTOP;
|
||||
ssa->svr4_sa_flags |= SVR4_SA_NOCLDSTOP;
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: svr4_signal.h,v 1.22 2002/07/04 23:32:13 thorpej Exp $ */
|
||||
/* $NetBSD: svr4_signal.h,v 1.23 2002/11/26 18:43:22 christos Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1994 The NetBSD Foundation, Inc.
|
||||
|
@ -106,10 +106,10 @@ typedef struct {
|
|||
} svr4_sigset_t;
|
||||
|
||||
struct svr4_sigaction {
|
||||
int sa_flags;
|
||||
svr4_sig_t sa_handler;
|
||||
svr4_sigset_t sa_mask;
|
||||
int sa_reserved[2];
|
||||
int svr4_sa_flags;
|
||||
svr4_sig_t svr4_sa_handler;
|
||||
svr4_sigset_t svr4_sa_mask;
|
||||
int svr4_sa_reserved[2];
|
||||
};
|
||||
|
||||
/* sa_flags */
|
||||
|
|
Loading…
Reference in New Issue