upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move SIG_HOLD back to signalvar.h.

Browse source 
Fix style bugs and comments while I'm here.

Submitted by: bde
This commit is contained in:
Marcel Moolenaar 1999-10-12 13:58:16 +00:00
parent 64ff567e0a
commit c981e3f992
3 changed files with 15 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sys/sys/_sigset.h
View file

@ -122,7 +122,6 @@ typedef void __sighandler_t __P((int));
#define SIG_DFL ((__sighandler_t *)0)
#define SIG_IGN ((__sighandler_t *)1)
#define SIG_HOLD ((__sighandler_t *)2)
#define SIG_ERR ((__sighandler_t *)-1)
#if defined(_P1003_1B_VISIBLE) || defined(KERNEL)
@ -135,7 +134,7 @@ union sigval {
typedef struct __siginfo {
int si_signo; /* signal number */
int si_errno; /* errno association */
/*
/*
* Cause of signal, one of the SI_ macros or signal-specific
* values, i.e. one of the FPE_... values for SIGFPE. This
* value is equivalent to the second argument to an old-style
@ -157,9 +156,8 @@ typedef struct __sigset {
} sigset_t;
/*
* XXX - there are some nasty dependencies.
* Now that sigset_t has been defined we can
* include the MD structures.
* XXX - there are some nasty dependencies on include file order. Now that
* sigset_t has been defined we can include the MD header.
*/
#include <machine/signal.h> /* sig_atomic_t; trap codes; sigcontext */

8
sys/sys/signal.h
View file

@ -122,7 +122,6 @@ typedef void __sighandler_t __P((int));
#define SIG_DFL ((__sighandler_t *)0)
#define SIG_IGN ((__sighandler_t *)1)
#define SIG_HOLD ((__sighandler_t *)2)
#define SIG_ERR ((__sighandler_t *)-1)
#if defined(_P1003_1B_VISIBLE) || defined(KERNEL)
@ -135,7 +134,7 @@ union sigval {
typedef struct __siginfo {
int si_signo; /* signal number */
int si_errno; /* errno association */
/*
/*
* Cause of signal, one of the SI_ macros or signal-specific
* values, i.e. one of the FPE_... values for SIGFPE. This
* value is equivalent to the second argument to an old-style
@ -157,9 +156,8 @@ typedef struct __sigset {
} sigset_t;
/*
* XXX - there are some nasty dependencies.
* Now that sigset_t has been defined we can
* include the MD structures.
* XXX - there are some nasty dependencies on include file order. Now that
* sigset_t has been defined we can include the MD header.
*/
#include <machine/signal.h> /* sig_atomic_t; trap codes; sigcontext */

21
sys/sys/signalvar.h
View file

@ -63,7 +63,7 @@ struct sigacts {
};
/*
* Compatibility
* Compatibility.
*/
typedef struct {
struct osigcontext si_sc;
@ -83,12 +83,9 @@ struct osigaction {
typedef void __osiginfohandler_t __P((int, osiginfo_t *, void *));
/*
* additional signal action values, used only temporarily/internally
* NOTE: SIG_HOLD was previously internal only, but has been moved to
* sys/signal.h
*/
#define SIG_CATCH ((__sighandler_t *)3)
/* additional signal action values, used only temporarily/internally */
#define SIG_CATCH ((__sighandler_t *)2)
#define SIG_HOLD ((__sighandler_t *)3)
/*
* get signal action for process and signal; currently only for current process
@ -166,7 +163,8 @@ typedef void __osiginfohandler_t __P((int, osiginfo_t *, void *));
#define SIG2OSIG(sig, osig) osig = (sig).__bits[0]
#define OSIG2SIG(osig, sig) SIGEMPTYSET(sig); (sig).__bits[0] = osig
extern __inline int __sigisempty(sigset_t *set)
extern __inline int
__sigisempty(sigset_t *set)
{
int i;
@ -177,7 +175,8 @@ extern __inline int __sigisempty(sigset_t *set)
return (1);
}
extern __inline int __sigseteq(sigset_t *set1, sigset_t *set2)
extern __inline int
__sigseteq(sigset_t *set1, sigset_t *set2)
{
int i;
@ -199,6 +198,7 @@ extern int sugid_coredump; /* Sysctl variable kern.sugid_coredump */
/*
* Machine-independent functions:
*/
void check_sigacts __P((void));
void execsigs __P((struct proc *p));
void gsignal __P((int pgid, int sig));
int issignal __P((struct proc *p));
@ -210,15 +210,12 @@ void psignal __P((struct proc *p, int sig));
void sigexit __P((struct proc *p, int signum));
void siginit __P((struct proc *p));
void trapsignal __P((struct proc *p, int sig, u_long code));
void check_sigacts __P((void));
int __sig_ffs __P((sigset_t *set));
int __cursig __P((struct proc *p));
/*
* Machine-dependent functions:
*/
void sendsig __P((sig_t action, int sig, sigset_t *retmask, u_long code));
int md_sigreturn __P((struct proc *p, void *sigcntxp, sigset_t *mask));
/*
* Inline functions: