diff options
| author | mycroft <mycroft@NetBSD.org> | 1995-08-14 01:11:52 +0000 |
|---|---|---|
| committer | mycroft <mycroft@NetBSD.org> | 1995-08-14 01:11:52 +0000 |
| commit | eba2f2e81ae89a368fba4a37ef20db91a052db18 (patch) | |
| tree | cabe7e7ba4113b44736d167e111f9edfd5862ce6 /sys | |
| parent | 3b76c0ddef216b2787f8400119d7ac56f2b639e4 (diff) | |
Move signal types into signal.h.
Diffstat (limited to 'sys')
26 files changed, 295 insertions, 339 deletions
diff --git a/sys/compat/ibcs2/ibcs2_signal.c b/sys/compat/ibcs2/ibcs2_signal.c index dd054bc84a4..15b0cf85f17 100644 --- a/sys/compat/ibcs2/ibcs2_signal.c +++ b/sys/compat/ibcs2/ibcs2_signal.c @@ -1,4 +1,4 @@ -/* $NetBSD: ibcs2_signal.c,v 1.4 1995/08/14 00:44:12 mycroft Exp $ */ +/* $NetBSD: ibcs2_signal.c,v 1.5 1995/08/14 01:11:52 mycroft Exp $ */ /* * Copyright (c) 1995 Scott Bartram @@ -42,13 +42,9 @@ #include <sys/syscallargs.h> #include <compat/ibcs2/ibcs2_types.h> +#include <compat/ibcs2/ibcs2_signal.h> #include <compat/ibcs2/ibcs2_syscallargs.h> #include <compat/ibcs2/ibcs2_util.h> -#include <compat/ibcs2/ibcs2_signal.h> - -#include <sys/file.h> -#include <sys/stat.h> -#include <compat/ibcs2/ibcs2_fcntl.h> #define sigemptyset(s) bzero((s), sizeof(*(s))) #define sigismember(s, n) (*(s) & sigmask(n)) @@ -59,7 +55,7 @@ #define ibcs2_sigismember(s, n) (*(s) & ibcs2_sigmask(n)) #define ibcs2_sigaddset(s, n) (*(s) |= ibcs2_sigmask(n)) -int bcd_to_ibcs2_sig[] = { +int bsd_to_ibcs2_sig[] = { 0, /* 0 */ IBCS2_SIGHUP, /* 1 */ IBCS2_SIGINT, /* 2 */ diff --git a/sys/compat/ibcs2/ibcs2_signal.h b/sys/compat/ibcs2/ibcs2_signal.h index 82332cbe3a0..75a2badc94d 100644 --- a/sys/compat/ibcs2/ibcs2_signal.h +++ b/sys/compat/ibcs2/ibcs2_signal.h @@ -1,4 +1,4 @@ -/* $NetBSD: ibcs2_signal.h,v 1.5 1995/08/14 00:50:27 mycroft Exp $ */ +/* $NetBSD: ibcs2_signal.h,v 1.6 1995/08/14 01:11:53 mycroft Exp $ */ /* * Copyright (c) 1994, 1995 Scott Bartram @@ -88,10 +88,13 @@ #define IBCS2_SIG_BLOCK 1 #define IBCS2_SIG_UNBLOCK 2 +typedef long ibcs2_sigset_t; +typedef void (*ibcs2_sig_t) __P((int)); + struct ibcs2_sigaction { - void (*sa_handler)(); - long sa_mask; - int sa_flags; + ibcs2_sig_t sa_handler; + ibcs2_sigset_t sa_mask; + int sa_flags; }; /* sa_flags */ diff --git a/sys/compat/ibcs2/ibcs2_types.h b/sys/compat/ibcs2/ibcs2_types.h index c9a63107271..305a1fc6f44 100644 --- a/sys/compat/ibcs2/ibcs2_types.h +++ b/sys/compat/ibcs2/ibcs2_types.h @@ -1,4 +1,4 @@ -/* $NetBSD: ibcs2_types.h,v 1.4 1995/08/14 00:50:28 mycroft Exp $ */ +/* $NetBSD: ibcs2_types.h,v 1.5 1995/08/14 01:11:54 mycroft Exp $ */ /* * Copyright (c) 1994 Scott Bartram @@ -50,7 +50,5 @@ typedef long ibcs2_time_t; typedef long ibcs2_clock_t; typedef unsigned short ibcs2_mode_t; typedef short ibcs2_pid_t; -typedef long ibcs2_sigset_t; -typedef void (*ibcs2_sig_t)(int); #endif /* _IBCS2_TYPES_H */ diff --git a/sys/compat/linux/arch/i386/linux_sigarray.c b/sys/compat/linux/arch/i386/linux_sigarray.c index 96aa059cbba..7c9c3ec68e4 100644 --- a/sys/compat/linux/arch/i386/linux_sigarray.c +++ b/sys/compat/linux/arch/i386/linux_sigarray.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_sigarray.c,v 1.6 1995/08/13 22:55:28 mycroft Exp $ */ +/* $NetBSD: linux_sigarray.c,v 1.7 1995/08/14 01:12:15 mycroft Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -48,9 +48,9 @@ #include <sys/syscallargs.h> #include <compat/linux/linux_types.h> +#include <compat/linux/linux_signal.h> #include <compat/linux/linux_syscallargs.h> #include <compat/linux/linux_util.h> -#include <compat/linux/linux_signal.h> #define sigemptyset(s) bzero((s), sizeof(*(s))) #define sigismember(s, n) (*(s) & sigmask(n)) diff --git a/sys/compat/linux/arch/i386/linux_signal.h b/sys/compat/linux/arch/i386/linux_signal.h index 46c5ad4cbc6..d5deba302ad 100644 --- a/sys/compat/linux/arch/i386/linux_signal.h +++ b/sys/compat/linux/arch/i386/linux_signal.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_signal.h,v 1.1 1995/02/28 23:26:01 fvdl Exp $ */ +/* $NetBSD: linux_signal.h,v 1.2 1995/08/14 01:12:16 mycroft Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -34,10 +34,54 @@ #ifndef _LINUX_SIGNAL_H #define _LINUX_SIGNAL_H -#define LINUX_NSIG 32 +#define LINUX_SIGHUP 1 +#define LINUX_SIGINT 2 +#define LINUX_SIGQUIT 3 +#define LINUX_SIGILL 4 +#define LINUX_SIGTRAP 5 +#define LINUX_SIGABRT 6 +#define LINUX_SIGIOT 6 +#define LINUX_SIGBUS 7 +#define LINUX_SIGFPE 8 +#define LINUX_SIGKILL 9 +#define LINUX_SIGUSR1 10 +#define LINUX_SIGSEGV 11 +#define LINUX_SIGUSR2 12 +#define LINUX_SIGPIPE 13 +#define LINUX_SIGALRM 14 +#define LINUX_SIGTERM 15 +#define LINUX_SIGSTKFLT 16 +#define LINUX_SIGCHLD 17 +#define LINUX_SIGCONT 18 +#define LINUX_SIGSTOP 19 +#define LINUX_SIGTSTP 20 +#define LINUX_SIGTTIN 21 +#define LINUX_SIGTTOU 22 +#define LINUX_SIGURG 23 +#define LINUX_SIGXCPU 24 +#define LINUX_SIGXFSZ 25 +#define LINUX_SIGVTALRM 26 +#define LINUX_SIGPROF 27 +#define LINUX_SIGWINCH 28 +#define LINUX_SIGIO 29 +#define LINUX_SIGPWR 30 +#define LINUX_NSIG 32 -/* sigaction flags */ +#define LINUX_SIG_BLOCK 0 +#define LINUX_SIG_UNBLOCK 1 +#define LINUX_SIG_SETMASK 2 +typedef u_long linux_sigset_t; +typedef void (*linux_handler_t) __P((int)); + +struct linux_sigaction { + linux_handler_t sa_handler; + linux_sigset_t sa_mask; + u_long sa_flags; + void (*sa_restorer) __P((void)); +}; + +/* sa_flags */ #define LINUX_SA_NOCLDSTOP 0x00000001 #define LINUX_SA_ONSTACK 0x08000000 #define LINUX_SA_RESTART 0x10000000 @@ -45,44 +89,4 @@ #define LINUX_SA_NOMASK 0x40000000 #define LINUX_SA_ONESHOT 0x80000000 -/* sigprocmask actions */ - -#define LINUX_SIG_BLOCK 0 -#define LINUX_SIG_UNBLOCK 1 -#define LINUX_SIG_SETMASK 2 - -/* signal numbers */ - -#define LINUX_SIGHUP 1 -#define LINUX_SIGINT 2 -#define LINUX_SIGQUIT 3 -#define LINUX_SIGILL 4 -#define LINUX_SIGTRAP 5 -#define LINUX_SIGABRT 6 -#define LINUX_SIGIOT 6 -#define LINUX_SIGBUS 7 -#define LINUX_SIGFPE 8 -#define LINUX_SIGKILL 9 -#define LINUX_SIGUSR1 10 -#define LINUX_SIGSEGV 11 -#define LINUX_SIGUSR2 12 -#define LINUX_SIGPIPE 13 -#define LINUX_SIGALRM 14 -#define LINUX_SIGTERM 15 -#define LINUX_SIGSTKFLT 16 -#define LINUX_SIGCHLD 17 -#define LINUX_SIGCONT 18 -#define LINUX_SIGSTOP 19 -#define LINUX_SIGTSTP 20 -#define LINUX_SIGTTIN 21 -#define LINUX_SIGTTOU 22 -#define LINUX_SIGURG 23 -#define LINUX_SIGXCPU 24 -#define LINUX_SIGXFSZ 25 -#define LINUX_SIGVTALRM 26 -#define LINUX_SIGPROF 27 -#define LINUX_SIGWINCH 28 -#define LINUX_SIGIO 29 -#define LINUX_SIGPWR 30 - #endif /* !_LINUX_SIGNAL_H */ diff --git a/sys/compat/linux/arch/i386/linux_types.h b/sys/compat/linux/arch/i386/linux_types.h index 627f7d01e02..cbd5bf6d9db 100644 --- a/sys/compat/linux/arch/i386/linux_types.h +++ b/sys/compat/linux/arch/i386/linux_types.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_types.h,v 1.2 1995/03/05 23:23:48 fvdl Exp $ */ +/* $NetBSD: linux_types.h,v 1.3 1995/08/14 01:12:17 mycroft Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -48,8 +48,6 @@ typedef long linux_time_t; typedef long linux_clock_t; typedef long linux_off_t; typedef int linux_pid_t; -typedef unsigned long linux_sigset_t; -typedef void (*linux_handler_t)(int); struct linux_statfs { long l_ftype; @@ -76,13 +74,6 @@ struct linux_utsname { char l_domainname[65]; }; -struct linux_sigaction { - void (*sa_handler)(int); - linux_sigset_t sa_mask; - unsigned long sa_flags; - void (*sa_restorer)(void); -}; - /* * Passed to the mmap() system call */ diff --git a/sys/compat/linux/common/linux_olduname.h b/sys/compat/linux/common/linux_olduname.h index cd68fe7475c..1daf1fff12f 100644 --- a/sys/compat/linux/common/linux_olduname.h +++ b/sys/compat/linux/common/linux_olduname.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_olduname.h,v 1.2 1995/03/05 23:23:48 fvdl Exp $ */ +/* $NetBSD: linux_olduname.h,v 1.3 1995/08/14 01:12:17 mycroft Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -48,8 +48,6 @@ typedef long linux_time_t; typedef long linux_clock_t; typedef long linux_off_t; typedef int linux_pid_t; -typedef unsigned long linux_sigset_t; -typedef void (*linux_handler_t)(int); struct linux_statfs { long l_ftype; @@ -76,13 +74,6 @@ struct linux_utsname { char l_domainname[65]; }; -struct linux_sigaction { - void (*sa_handler)(int); - linux_sigset_t sa_mask; - unsigned long sa_flags; - void (*sa_restorer)(void); -}; - /* * Passed to the mmap() system call */ diff --git a/sys/compat/linux/common/linux_sig_notalpha.c b/sys/compat/linux/common/linux_sig_notalpha.c index eaa9012b251..ba303102d07 100644 --- a/sys/compat/linux/common/linux_sig_notalpha.c +++ b/sys/compat/linux/common/linux_sig_notalpha.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_sig_notalpha.c,v 1.6 1995/08/13 22:55:28 mycroft Exp $ */ +/* $NetBSD: linux_sig_notalpha.c,v 1.7 1995/08/14 01:12:15 mycroft Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -48,9 +48,9 @@ #include <sys/syscallargs.h> #include <compat/linux/linux_types.h> +#include <compat/linux/linux_signal.h> #include <compat/linux/linux_syscallargs.h> #include <compat/linux/linux_util.h> -#include <compat/linux/linux_signal.h> #define sigemptyset(s) bzero((s), sizeof(*(s))) #define sigismember(s, n) (*(s) & sigmask(n)) diff --git a/sys/compat/linux/common/linux_sigaction.c b/sys/compat/linux/common/linux_sigaction.c index 62c394d833a..eaa6c805669 100644 --- a/sys/compat/linux/common/linux_sigaction.c +++ b/sys/compat/linux/common/linux_sigaction.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_sigaction.c,v 1.6 1995/08/13 22:55:28 mycroft Exp $ */ +/* $NetBSD: linux_sigaction.c,v 1.7 1995/08/14 01:12:15 mycroft Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -48,9 +48,9 @@ #include <sys/syscallargs.h> #include <compat/linux/linux_types.h> +#include <compat/linux/linux_signal.h> #include <compat/linux/linux_syscallargs.h> #include <compat/linux/linux_util.h> -#include <compat/linux/linux_signal.h> #define sigemptyset(s) bzero((s), sizeof(*(s))) #define sigismember(s, n) (*(s) & sigmask(n)) diff --git a/sys/compat/linux/common/linux_signal.c b/sys/compat/linux/common/linux_signal.c index 9f83920594d..6ad3c57d054 100644 --- a/sys/compat/linux/common/linux_signal.c +++ b/sys/compat/linux/common/linux_signal.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_signal.c,v 1.6 1995/08/13 22:55:28 mycroft Exp $ */ +/* $NetBSD: linux_signal.c,v 1.7 1995/08/14 01:12:15 mycroft Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -48,9 +48,9 @@ #include <sys/syscallargs.h> #include <compat/linux/linux_types.h> +#include <compat/linux/linux_signal.h> #include <compat/linux/linux_syscallargs.h> #include <compat/linux/linux_util.h> -#include <compat/linux/linux_signal.h> #define sigemptyset(s) bzero((s), sizeof(*(s))) #define sigismember(s, n) (*(s) & sigmask(n)) diff --git a/sys/compat/linux/common/linux_signal.h b/sys/compat/linux/common/linux_signal.h index 46c5ad4cbc6..d5deba302ad 100644 --- a/sys/compat/linux/common/linux_signal.h +++ b/sys/compat/linux/common/linux_signal.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_signal.h,v 1.1 1995/02/28 23:26:01 fvdl Exp $ */ +/* $NetBSD: linux_signal.h,v 1.2 1995/08/14 01:12:16 mycroft Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -34,10 +34,54 @@ #ifndef _LINUX_SIGNAL_H #define _LINUX_SIGNAL_H -#define LINUX_NSIG 32 +#define LINUX_SIGHUP 1 +#define LINUX_SIGINT 2 +#define LINUX_SIGQUIT 3 +#define LINUX_SIGILL 4 +#define LINUX_SIGTRAP 5 +#define LINUX_SIGABRT 6 +#define LINUX_SIGIOT 6 +#define LINUX_SIGBUS 7 +#define LINUX_SIGFPE 8 +#define LINUX_SIGKILL 9 +#define LINUX_SIGUSR1 10 +#define LINUX_SIGSEGV 11 +#define LINUX_SIGUSR2 12 +#define LINUX_SIGPIPE 13 +#define LINUX_SIGALRM 14 +#define LINUX_SIGTERM 15 +#define LINUX_SIGSTKFLT 16 +#define LINUX_SIGCHLD 17 +#define LINUX_SIGCONT 18 +#define LINUX_SIGSTOP 19 +#define LINUX_SIGTSTP 20 +#define LINUX_SIGTTIN 21 +#define LINUX_SIGTTOU 22 +#define LINUX_SIGURG 23 +#define LINUX_SIGXCPU 24 +#define LINUX_SIGXFSZ 25 +#define LINUX_SIGVTALRM 26 +#define LINUX_SIGPROF 27 +#define LINUX_SIGWINCH 28 +#define LINUX_SIGIO 29 +#define LINUX_SIGPWR 30 +#define LINUX_NSIG 32 -/* sigaction flags */ +#define LINUX_SIG_BLOCK 0 +#define LINUX_SIG_UNBLOCK 1 +#define LINUX_SIG_SETMASK 2 +typedef u_long linux_sigset_t; +typedef void (*linux_handler_t) __P((int)); + +struct linux_sigaction { + linux_handler_t sa_handler; + linux_sigset_t sa_mask; + u_long sa_flags; + void (*sa_restorer) __P((void)); +}; + +/* sa_flags */ #define LINUX_SA_NOCLDSTOP 0x00000001 #define LINUX_SA_ONSTACK 0x08000000 #define LINUX_SA_RESTART 0x10000000 @@ -45,44 +89,4 @@ #define LINUX_SA_NOMASK 0x40000000 #define LINUX_SA_ONESHOT 0x80000000 -/* sigprocmask actions */ - -#define LINUX_SIG_BLOCK 0 -#define LINUX_SIG_UNBLOCK 1 -#define LINUX_SIG_SETMASK 2 - -/* signal numbers */ - -#define LINUX_SIGHUP 1 -#define LINUX_SIGINT 2 -#define LINUX_SIGQUIT 3 -#define LINUX_SIGILL 4 -#define LINUX_SIGTRAP 5 -#define LINUX_SIGABRT 6 -#define LINUX_SIGIOT 6 -#define LINUX_SIGBUS 7 -#define LINUX_SIGFPE 8 -#define LINUX_SIGKILL 9 -#define LINUX_SIGUSR1 10 -#define LINUX_SIGSEGV 11 -#define LINUX_SIGUSR2 12 -#define LINUX_SIGPIPE 13 -#define LINUX_SIGALRM 14 -#define LINUX_SIGTERM 15 -#define LINUX_SIGSTKFLT 16 -#define LINUX_SIGCHLD 17 -#define LINUX_SIGCONT 18 -#define LINUX_SIGSTOP 19 -#define LINUX_SIGTSTP 20 -#define LINUX_SIGTTIN 21 -#define LINUX_SIGTTOU 22 -#define LINUX_SIGURG 23 -#define LINUX_SIGXCPU 24 -#define LINUX_SIGXFSZ 25 -#define LINUX_SIGVTALRM 26 -#define LINUX_SIGPROF 27 -#define LINUX_SIGWINCH 28 -#define LINUX_SIGIO 29 -#define LINUX_SIGPWR 30 - #endif /* !_LINUX_SIGNAL_H */ diff --git a/sys/compat/linux/common/linux_types.h b/sys/compat/linux/common/linux_types.h index 627f7d01e02..cbd5bf6d9db 100644 --- a/sys/compat/linux/common/linux_types.h +++ b/sys/compat/linux/common/linux_types.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_types.h,v 1.2 1995/03/05 23:23:48 fvdl Exp $ */ +/* $NetBSD: linux_types.h,v 1.3 1995/08/14 01:12:17 mycroft Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -48,8 +48,6 @@ typedef long linux_time_t; typedef long linux_clock_t; typedef long linux_off_t; typedef int linux_pid_t; -typedef unsigned long linux_sigset_t; -typedef void (*linux_handler_t)(int); struct linux_statfs { long l_ftype; @@ -76,13 +74,6 @@ struct linux_utsname { char l_domainname[65]; }; -struct linux_sigaction { - void (*sa_handler)(int); - linux_sigset_t sa_mask; - unsigned long sa_flags; - void (*sa_restorer)(void); -}; - /* * Passed to the mmap() system call */ diff --git a/sys/compat/linux/i386/linux_sigarray.c b/sys/compat/linux/i386/linux_sigarray.c index 96aa059cbba..7c9c3ec68e4 100644 --- a/sys/compat/linux/i386/linux_sigarray.c +++ b/sys/compat/linux/i386/linux_sigarray.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_sigarray.c,v 1.6 1995/08/13 22:55:28 mycroft Exp $ */ +/* $NetBSD: linux_sigarray.c,v 1.7 1995/08/14 01:12:15 mycroft Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -48,9 +48,9 @@ #include <sys/syscallargs.h> #include <compat/linux/linux_types.h> +#include <compat/linux/linux_signal.h> #include <compat/linux/linux_syscallargs.h> #include <compat/linux/linux_util.h> -#include <compat/linux/linux_signal.h> #define sigemptyset(s) bzero((s), sizeof(*(s))) #define sigismember(s, n) (*(s) & sigmask(n)) diff --git a/sys/compat/linux/i386/linux_signal.h b/sys/compat/linux/i386/linux_signal.h index 46c5ad4cbc6..d5deba302ad 100644 --- a/sys/compat/linux/i386/linux_signal.h +++ b/sys/compat/linux/i386/linux_signal.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_signal.h,v 1.1 1995/02/28 23:26:01 fvdl Exp $ */ +/* $NetBSD: linux_signal.h,v 1.2 1995/08/14 01:12:16 mycroft Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -34,10 +34,54 @@ #ifndef _LINUX_SIGNAL_H #define _LINUX_SIGNAL_H -#define LINUX_NSIG 32 +#define LINUX_SIGHUP 1 +#define LINUX_SIGINT 2 +#define LINUX_SIGQUIT 3 +#define LINUX_SIGILL 4 +#define LINUX_SIGTRAP 5 +#define LINUX_SIGABRT 6 +#define LINUX_SIGIOT 6 +#define LINUX_SIGBUS 7 +#define LINUX_SIGFPE 8 +#define LINUX_SIGKILL 9 +#define LINUX_SIGUSR1 10 +#define LINUX_SIGSEGV 11 +#define LINUX_SIGUSR2 12 +#define LINUX_SIGPIPE 13 +#define LINUX_SIGALRM 14 +#define LINUX_SIGTERM 15 +#define LINUX_SIGSTKFLT 16 +#define LINUX_SIGCHLD 17 +#define LINUX_SIGCONT 18 +#define LINUX_SIGSTOP 19 +#define LINUX_SIGTSTP 20 +#define LINUX_SIGTTIN 21 +#define LINUX_SIGTTOU 22 +#define LINUX_SIGURG 23 +#define LINUX_SIGXCPU 24 +#define LINUX_SIGXFSZ 25 +#define LINUX_SIGVTALRM 26 +#define LINUX_SIGPROF 27 +#define LINUX_SIGWINCH 28 +#define LINUX_SIGIO 29 +#define LINUX_SIGPWR 30 +#define LINUX_NSIG 32 -/* sigaction flags */ +#define LINUX_SIG_BLOCK 0 +#define LINUX_SIG_UNBLOCK 1 +#define LINUX_SIG_SETMASK 2 +typedef u_long linux_sigset_t; +typedef void (*linux_handler_t) __P((int)); + +struct linux_sigaction { + linux_handler_t sa_handler; + linux_sigset_t sa_mask; + u_long sa_flags; + void (*sa_restorer) __P((void)); +}; + +/* sa_flags */ #define LINUX_SA_NOCLDSTOP 0x00000001 #define LINUX_SA_ONSTACK 0x08000000 #define LINUX_SA_RESTART 0x10000000 @@ -45,44 +89,4 @@ #define LINUX_SA_NOMASK 0x40000000 #define LINUX_SA_ONESHOT 0x80000000 -/* sigprocmask actions */ - -#define LINUX_SIG_BLOCK 0 -#define LINUX_SIG_UNBLOCK 1 -#define LINUX_SIG_SETMASK 2 - -/* signal numbers */ - -#define LINUX_SIGHUP 1 -#define LINUX_SIGINT 2 -#define LINUX_SIGQUIT 3 -#define LINUX_SIGILL 4 -#define LINUX_SIGTRAP 5 -#define LINUX_SIGABRT 6 -#define LINUX_SIGIOT 6 -#define LINUX_SIGBUS 7 -#define LINUX_SIGFPE 8 -#define LINUX_SIGKILL 9 -#define LINUX_SIGUSR1 10 -#define LINUX_SIGSEGV 11 -#define LINUX_SIGUSR2 12 -#define LINUX_SIGPIPE 13 -#define LINUX_SIGALRM 14 -#define LINUX_SIGTERM 15 -#define LINUX_SIGSTKFLT 16 -#define LINUX_SIGCHLD 17 -#define LINUX_SIGCONT 18 -#define LINUX_SIGSTOP 19 -#define LINUX_SIGTSTP 20 -#define LINUX_SIGTTIN 21 -#define LINUX_SIGTTOU 22 -#define LINUX_SIGURG 23 -#define LINUX_SIGXCPU 24 -#define LINUX_SIGXFSZ 25 -#define LINUX_SIGVTALRM 26 -#define LINUX_SIGPROF 27 -#define LINUX_SIGWINCH 28 -#define LINUX_SIGIO 29 -#define LINUX_SIGPWR 30 - #endif /* !_LINUX_SIGNAL_H */ diff --git a/sys/compat/linux/i386/linux_types.h b/sys/compat/linux/i386/linux_types.h index 627f7d01e02..cbd5bf6d9db 100644 --- a/sys/compat/linux/i386/linux_types.h +++ b/sys/compat/linux/i386/linux_types.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_types.h,v 1.2 1995/03/05 23:23:48 fvdl Exp $ */ +/* $NetBSD: linux_types.h,v 1.3 1995/08/14 01:12:17 mycroft Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -48,8 +48,6 @@ typedef long linux_time_t; typedef long linux_clock_t; typedef long linux_off_t; typedef int linux_pid_t; -typedef unsigned long linux_sigset_t; -typedef void (*linux_handler_t)(int); struct linux_statfs { long l_ftype; @@ -76,13 +74,6 @@ struct linux_utsname { char l_domainname[65]; }; -struct linux_sigaction { - void (*sa_handler)(int); - linux_sigset_t sa_mask; - unsigned long sa_flags; - void (*sa_restorer)(void); -}; - /* * Passed to the mmap() system call */ diff --git a/sys/compat/linux/include/linux_signal.h b/sys/compat/linux/include/linux_signal.h index 46c5ad4cbc6..d5deba302ad 100644 --- a/sys/compat/linux/include/linux_signal.h +++ b/sys/compat/linux/include/linux_signal.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_signal.h,v 1.1 1995/02/28 23:26:01 fvdl Exp $ */ +/* $NetBSD: linux_signal.h,v 1.2 1995/08/14 01:12:16 mycroft Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -34,10 +34,54 @@ #ifndef _LINUX_SIGNAL_H #define _LINUX_SIGNAL_H -#define LINUX_NSIG 32 +#define LINUX_SIGHUP 1 +#define LINUX_SIGINT 2 +#define LINUX_SIGQUIT 3 +#define LINUX_SIGILL 4 +#define LINUX_SIGTRAP 5 +#define LINUX_SIGABRT 6 +#define LINUX_SIGIOT 6 +#define LINUX_SIGBUS 7 +#define LINUX_SIGFPE 8 +#define LINUX_SIGKILL 9 +#define LINUX_SIGUSR1 10 +#define LINUX_SIGSEGV 11 +#define LINUX_SIGUSR2 12 +#define LINUX_SIGPIPE 13 +#define LINUX_SIGALRM 14 +#define LINUX_SIGTERM 15 +#define LINUX_SIGSTKFLT 16 +#define LINUX_SIGCHLD 17 +#define LINUX_SIGCONT 18 +#define LINUX_SIGSTOP 19 +#define LINUX_SIGTSTP 20 +#define LINUX_SIGTTIN 21 +#define LINUX_SIGTTOU 22 +#define LINUX_SIGURG 23 +#define LINUX_SIGXCPU 24 +#define LINUX_SIGXFSZ 25 +#define LINUX_SIGVTALRM 26 +#define LINUX_SIGPROF 27 +#define LINUX_SIGWINCH 28 +#define LINUX_SIGIO 29 +#define LINUX_SIGPWR 30 +#define LINUX_NSIG 32 -/* sigaction flags */ +#define LINUX_SIG_BLOCK 0 +#define LINUX_SIG_UNBLOCK 1 +#define LINUX_SIG_SETMASK 2 +typedef u_long linux_sigset_t; +typedef void (*linux_handler_t) __P((int)); + +struct linux_sigaction { + linux_handler_t sa_handler; + linux_sigset_t sa_mask; + u_long sa_flags; + void (*sa_restorer) __P((void)); +}; + +/* sa_flags */ #define LINUX_SA_NOCLDSTOP 0x00000001 #define LINUX_SA_ONSTACK 0x08000000 #define LINUX_SA_RESTART 0x10000000 @@ -45,44 +89,4 @@ #define LINUX_SA_NOMASK 0x40000000 #define LINUX_SA_ONESHOT 0x80000000 -/* sigprocmask actions */ - -#define LINUX_SIG_BLOCK 0 -#define LINUX_SIG_UNBLOCK 1 -#define LINUX_SIG_SETMASK 2 - -/* signal numbers */ - -#define LINUX_SIGHUP 1 -#define LINUX_SIGINT 2 -#define LINUX_SIGQUIT 3 -#define LINUX_SIGILL 4 -#define LINUX_SIGTRAP 5 -#define LINUX_SIGABRT 6 -#define LINUX_SIGIOT 6 -#define LINUX_SIGBUS 7 -#define LINUX_SIGFPE 8 -#define LINUX_SIGKILL 9 -#define LINUX_SIGUSR1 10 -#define LINUX_SIGSEGV 11 -#define LINUX_SIGUSR2 12 -#define LINUX_SIGPIPE 13 -#define LINUX_SIGALRM 14 -#define LINUX_SIGTERM 15 -#define LINUX_SIGSTKFLT 16 -#define LINUX_SIGCHLD 17 -#define LINUX_SIGCONT 18 -#define LINUX_SIGSTOP 19 -#define LINUX_SIGTSTP 20 -#define LINUX_SIGTTIN 21 -#define LINUX_SIGTTOU 22 -#define LINUX_SIGURG 23 -#define LINUX_SIGXCPU 24 -#define LINUX_SIGXFSZ 25 -#define LINUX_SIGVTALRM 26 -#define LINUX_SIGPROF 27 -#define LINUX_SIGWINCH 28 -#define LINUX_SIGIO 29 -#define LINUX_SIGPWR 30 - #endif /* !_LINUX_SIGNAL_H */ diff --git a/sys/compat/linux/include/linux_types.h b/sys/compat/linux/include/linux_types.h index 627f7d01e02..cbd5bf6d9db 100644 --- a/sys/compat/linux/include/linux_types.h +++ b/sys/compat/linux/include/linux_types.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_types.h,v 1.2 1995/03/05 23:23:48 fvdl Exp $ */ +/* $NetBSD: linux_types.h,v 1.3 1995/08/14 01:12:17 mycroft Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -48,8 +48,6 @@ typedef long linux_time_t; typedef long linux_clock_t; typedef long linux_off_t; typedef int linux_pid_t; -typedef unsigned long linux_sigset_t; -typedef void (*linux_handler_t)(int); struct linux_statfs { long l_ftype; @@ -76,13 +74,6 @@ struct linux_utsname { char l_domainname[65]; }; -struct linux_sigaction { - void (*sa_handler)(int); - linux_sigset_t sa_mask; - unsigned long sa_flags; - void (*sa_restorer)(void); -}; - /* * Passed to the mmap() system call */ diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c index 9f83920594d..6ad3c57d054 100644 --- a/sys/compat/linux/linux_signal.c +++ b/sys/compat/linux/linux_signal.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_signal.c,v 1.6 1995/08/13 22:55:28 mycroft Exp $ */ +/* $NetBSD: linux_signal.c,v 1.7 1995/08/14 01:12:15 mycroft Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -48,9 +48,9 @@ #include <sys/syscallargs.h> #include <compat/linux/linux_types.h> +#include <compat/linux/linux_signal.h> #include <compat/linux/linux_syscallargs.h> #include <compat/linux/linux_util.h> -#include <compat/linux/linux_signal.h> #define sigemptyset(s) bzero((s), sizeof(*(s))) #define sigismember(s, n) (*(s) & sigmask(n)) diff --git a/sys/compat/linux/linux_signal.h b/sys/compat/linux/linux_signal.h index 46c5ad4cbc6..d5deba302ad 100644 --- a/sys/compat/linux/linux_signal.h +++ b/sys/compat/linux/linux_signal.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_signal.h,v 1.1 1995/02/28 23:26:01 fvdl Exp $ */ +/* $NetBSD: linux_signal.h,v 1.2 1995/08/14 01:12:16 mycroft Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -34,10 +34,54 @@ #ifndef _LINUX_SIGNAL_H #define _LINUX_SIGNAL_H -#define LINUX_NSIG 32 +#define LINUX_SIGHUP 1 +#define LINUX_SIGINT 2 +#define LINUX_SIGQUIT 3 +#define LINUX_SIGILL 4 +#define LINUX_SIGTRAP 5 +#define LINUX_SIGABRT 6 +#define LINUX_SIGIOT 6 +#define LINUX_SIGBUS 7 +#define LINUX_SIGFPE 8 +#define LINUX_SIGKILL 9 +#define LINUX_SIGUSR1 10 +#define LINUX_SIGSEGV 11 +#define LINUX_SIGUSR2 12 +#define LINUX_SIGPIPE 13 +#define LINUX_SIGALRM 14 +#define LINUX_SIGTERM 15 +#define LINUX_SIGSTKFLT 16 +#define LINUX_SIGCHLD 17 +#define LINUX_SIGCONT 18 +#define LINUX_SIGSTOP 19 +#define LINUX_SIGTSTP 20 +#define LINUX_SIGTTIN 21 +#define LINUX_SIGTTOU 22 +#define LINUX_SIGURG 23 +#define LINUX_SIGXCPU 24 +#define LINUX_SIGXFSZ 25 +#define LINUX_SIGVTALRM 26 +#define LINUX_SIGPROF 27 +#define LINUX_SIGWINCH 28 +#define LINUX_SIGIO 29 +#define LINUX_SIGPWR 30 +#define LINUX_NSIG 32 -/* sigaction flags */ +#define LINUX_SIG_BLOCK 0 +#define LINUX_SIG_UNBLOCK 1 +#define LINUX_SIG_SETMASK 2 +typedef u_long linux_sigset_t; +typedef void (*linux_handler_t) __P((int)); + +struct linux_sigaction { + linux_handler_t sa_handler; + linux_sigset_t sa_mask; + u_long sa_flags; + void (*sa_restorer) __P((void)); +}; + +/* sa_flags */ #define LINUX_SA_NOCLDSTOP 0x00000001 #define LINUX_SA_ONSTACK 0x08000000 #define LINUX_SA_RESTART 0x10000000 @@ -45,44 +89,4 @@ #define LINUX_SA_NOMASK 0x40000000 #define LINUX_SA_ONESHOT 0x80000000 -/* sigprocmask actions */ - -#define LINUX_SIG_BLOCK 0 -#define LINUX_SIG_UNBLOCK 1 -#define LINUX_SIG_SETMASK 2 - -/* signal numbers */ - -#define LINUX_SIGHUP 1 -#define LINUX_SIGINT 2 -#define LINUX_SIGQUIT 3 -#define LINUX_SIGILL 4 -#define LINUX_SIGTRAP 5 -#define LINUX_SIGABRT 6 -#define LINUX_SIGIOT 6 -#define LINUX_SIGBUS 7 -#define LINUX_SIGFPE 8 -#define LINUX_SIGKILL 9 -#define LINUX_SIGUSR1 10 -#define LINUX_SIGSEGV 11 -#define LINUX_SIGUSR2 12 -#define LINUX_SIGPIPE 13 -#define LINUX_SIGALRM 14 -#define LINUX_SIGTERM 15 -#define LINUX_SIGSTKFLT 16 -#define LINUX_SIGCHLD 17 -#define LINUX_SIGCONT 18 -#define LINUX_SIGSTOP 19 -#define LINUX_SIGTSTP 20 -#define LINUX_SIGTTIN 21 -#define LINUX_SIGTTOU 22 -#define LINUX_SIGURG 23 -#define LINUX_SIGXCPU 24 -#define LINUX_SIGXFSZ 25 -#define LINUX_SIGVTALRM 26 -#define LINUX_SIGPROF 27 -#define LINUX_SIGWINCH 28 -#define LINUX_SIGIO 29 -#define LINUX_SIGPWR 30 - #endif /* !_LINUX_SIGNAL_H */ diff --git a/sys/compat/linux/linux_types.h b/sys/compat/linux/linux_types.h index 627f7d01e02..cbd5bf6d9db 100644 --- a/sys/compat/linux/linux_types.h +++ b/sys/compat/linux/linux_types.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_types.h,v 1.2 1995/03/05 23:23:48 fvdl Exp $ */ +/* $NetBSD: linux_types.h,v 1.3 1995/08/14 01:12:17 mycroft Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -48,8 +48,6 @@ typedef long linux_time_t; typedef long linux_clock_t; typedef long linux_off_t; typedef int linux_pid_t; -typedef unsigned long linux_sigset_t; -typedef void (*linux_handler_t)(int); struct linux_statfs { long l_ftype; @@ -76,13 +74,6 @@ struct linux_utsname { char l_domainname[65]; }; -struct linux_sigaction { - void (*sa_handler)(int); - linux_sigset_t sa_mask; - unsigned long sa_flags; - void (*sa_restorer)(void); -}; - /* * Passed to the mmap() system call */ diff --git a/sys/compat/linux/multiarch/linux_olduname.h b/sys/compat/linux/multiarch/linux_olduname.h index cd68fe7475c..1daf1fff12f 100644 --- a/sys/compat/linux/multiarch/linux_olduname.h +++ b/sys/compat/linux/multiarch/linux_olduname.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_olduname.h,v 1.2 1995/03/05 23:23:48 fvdl Exp $ */ +/* $NetBSD: linux_olduname.h,v 1.3 1995/08/14 01:12:17 mycroft Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -48,8 +48,6 @@ typedef long linux_time_t; typedef long linux_clock_t; typedef long linux_off_t; typedef int linux_pid_t; -typedef unsigned long linux_sigset_t; -typedef void (*linux_handler_t)(int); struct linux_statfs { long l_ftype; @@ -76,13 +74,6 @@ struct linux_utsname { char l_domainname[65]; }; -struct linux_sigaction { - void (*sa_handler)(int); - linux_sigset_t sa_mask; - unsigned long sa_flags; - void (*sa_restorer)(void); -}; - /* * Passed to the mmap() system call */ diff --git a/sys/compat/linux/multiarch/linux_sig_notalpha.c b/sys/compat/linux/multiarch/linux_sig_notalpha.c index eaa9012b251..ba303102d07 100644 --- a/sys/compat/linux/multiarch/linux_sig_notalpha.c +++ b/sys/compat/linux/multiarch/linux_sig_notalpha.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_sig_notalpha.c,v 1.6 1995/08/13 22:55:28 mycroft Exp $ */ +/* $NetBSD: linux_sig_notalpha.c,v 1.7 1995/08/14 01:12:15 mycroft Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -48,9 +48,9 @@ #include <sys/syscallargs.h> #include <compat/linux/linux_types.h> +#include <compat/linux/linux_signal.h> #include <compat/linux/linux_syscallargs.h> #include <compat/linux/linux_util.h> -#include <compat/linux/linux_signal.h> #define sigemptyset(s) bzero((s), sizeof(*(s))) #define sigismember(s, n) (*(s) & sigmask(n)) diff --git a/sys/compat/linux/multiarch/linux_sigaction.c b/sys/compat/linux/multiarch/linux_sigaction.c index 62c394d833a..eaa6c805669 100644 --- a/sys/compat/linux/multiarch/linux_sigaction.c +++ b/sys/compat/linux/multiarch/linux_sigaction.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_sigaction.c,v 1.6 1995/08/13 22:55:28 mycroft Exp $ */ +/* $NetBSD: linux_sigaction.c,v 1.7 1995/08/14 01:12:15 mycroft Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -48,9 +48,9 @@ #include <sys/syscallargs.h> #include <compat/linux/linux_types.h> +#include <compat/linux/linux_signal.h> #include <compat/linux/linux_syscallargs.h> #include <compat/linux/linux_util.h> -#include <compat/linux/linux_signal.h> #define sigemptyset(s) bzero((s), sizeof(*(s))) #define sigismember(s, n) (*(s) & sigmask(n)) diff --git a/sys/compat/svr4/svr4_signal.c b/sys/compat/svr4/svr4_signal.c index 3fb641c17fb..e0c2e02378f 100644 --- a/sys/compat/svr4/svr4_signal.c +++ b/sys/compat/svr4/svr4_signal.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_signal.c,v 1.14 1995/08/14 00:41:02 mycroft Exp $ */ +/* $NetBSD: svr4_signal.c,v 1.15 1995/08/14 01:12:47 mycroft Exp $ */ /* * Copyright (c) 1994 Christos Zoulas @@ -42,6 +42,7 @@ #include <sys/syscallargs.h> #include <compat/svr4/svr4_types.h> +#include <compat/svr4/svr4_signal.h> #include <compat/svr4/svr4_syscallargs.h> #include <compat/svr4/svr4_util.h> #include <compat/svr4/svr4_ucontext.h> @@ -65,6 +66,7 @@ static inline int svr4_sigfillset(s) svr4_sigset_t *s; { + int i; svr4_sigemptyset(s); for (i = 1; i < SVR4_NSIG; i++) @@ -223,7 +225,7 @@ bsd_to_svr4_sigaction(bsa, ssa) void svr4_to_bsd_sigaltstack(sss, bss) - const svr4_stack_t *sss; + const struct svr4_sigaltstack *sss; struct sigaltstack *bss; { @@ -240,7 +242,7 @@ svr4_to_bsd_sigaltstack(sss, bss) void bsd_to_svr4_sigaltstack(bss, sss) const struct sigaltstack *bss; - svr4_stack_t *sss; + struct svr4_sigaltstack *sss; { sss->ss_sp = bss->ss_base; @@ -310,12 +312,12 @@ int svr4_sigaltstack(p, uap, retval) register struct proc *p; struct svr4_sigaltstack_args /* { - syscallarg(svr4_stack_t *) nss; - syscallarg(svr4_stack_t *) oss; + syscallarg(struct svr4_sigaltstack *) nss; + syscallarg(struct svr4_sigaltstack *) oss; } */ *uap; register_t *retval; { - struct svr4_stack_t *nsss, *osss, tmpsss; + struct svr4_sigaltstack *nsss, *osss, tmpsss; struct sigaltstack *nbss, *obss, tmpbss; struct sigaltstack_args sa; caddr_t sg; @@ -571,7 +573,7 @@ int svr4_sigsuspend(p, uap, retval) register struct proc *p; struct svr4_sigsuspend_args /* { - syscallarg(svr4_sigset_t *) sss; + syscallarg(svr4_sigset_t *) ss; } */ *uap; register_t *retval; { @@ -580,7 +582,7 @@ svr4_sigsuspend(p, uap, retval) struct sigsuspend_args sa; int error; - if ((error = copyin(SCARG(uap, sss), &sss, sizeof(sss))) != 0) + if ((error = copyin(SCARG(uap, ss), &sss, sizeof(sss))) != 0) return error; svr4_to_bsd_sigset(&sss, &bss); diff --git a/sys/compat/svr4/svr4_signal.h b/sys/compat/svr4/svr4_signal.h index 4cc87263b4d..55fa58b539a 100644 --- a/sys/compat/svr4/svr4_signal.h +++ b/sys/compat/svr4/svr4_signal.h @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_signal.h,v 1.10 1995/08/14 00:51:12 mycroft Exp $ */ +/* $NetBSD: svr4_signal.h,v 1.11 1995/08/14 01:12:49 mycroft Exp $ */ /* * Copyright (c) 1994 Christos Zoulas @@ -88,18 +88,23 @@ #define SVR4_SIG_UNBLOCK 2 #define SVR4_SIG_SETMASK 3 +typedef struct { + u_long bits[4]; +} svr4_sigset_t; +typedef void (*svr4_sig_t) __P((int)); + struct svr4_sigaction { - int sa_flags; - void (*sa_handler)(); - svr4_sigset_t sa_mask; - int sa_reserved[2]; + int sa_flags; + svr4_sig_t sa_handler; + svr4_sigset_t sa_mask; + int sa_reserved[2]; }; -typedef struct svr4_sigaltstack { - char *ss_sp; - int ss_size; - int ss_flags; -} svr4_stack_t; +struct svr4_sigaltstack { + char *ss_sp; + int ss_size; + int ss_flags; +}; /* sa_flags */ #define SVR4_SA_ONSTACK 0x00000001 diff --git a/sys/compat/svr4/svr4_types.h b/sys/compat/svr4/svr4_types.h index 4fd445bb765..ba553d432fd 100644 --- a/sys/compat/svr4/svr4_types.h +++ b/sys/compat/svr4/svr4_types.h @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_types.h,v 1.5 1995/08/14 00:51:13 mycroft Exp $ */ +/* $NetBSD: svr4_types.h,v 1.6 1995/08/14 01:12:50 mycroft Exp $ */ /* * Copyright (c) 1994 Christos Zoulas @@ -54,9 +54,4 @@ typedef long svr4_clock_t; typedef struct timespec svr4_timestruc_t; -typedef struct { - u_long bits[4]; -} svr4_sigset_t; -typedef void (*svr4_sig_t) (int); - #endif /* !_SVR4_TYPES_H_ */ |
