diff options
author | mp <mp@FreeBSD.org> | 2005-04-24 19:41:08 +0000 |
---|---|---|
committer | mp <mp@FreeBSD.org> | 2005-04-24 19:41:08 +0000 |
commit | 94a109bd814074f290affa8f7698847719d55833 (patch) | |
tree | 6daeb0464a7bc8705c0246b7fd98e212b6beed09 /contrib/tcsh/tc.sig.c | |
parent | bbd1addf8f9452690ad13ce5b875ee4cc9633958 (diff) | |
download | FreeBSD-src-94a109bd814074f290affa8f7698847719d55833.zip FreeBSD-src-94a109bd814074f290affa8f7698847719d55833.tar.gz |
Import of tcsh-6.14.00
Diffstat (limited to 'contrib/tcsh/tc.sig.c')
-rw-r--r-- | contrib/tcsh/tc.sig.c | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/contrib/tcsh/tc.sig.c b/contrib/tcsh/tc.sig.c index 3e1804b..95838b3 100644 --- a/contrib/tcsh/tc.sig.c +++ b/contrib/tcsh/tc.sig.c @@ -1,4 +1,4 @@ -/* $Header: /src/pub/tcsh/tc.sig.c,v 3.26 2002/03/08 17:36:47 christos Exp $ */ +/* $Header: /src/pub/tcsh/tc.sig.c,v 3.29 2005/01/18 20:24:51 christos Exp $ */ /* * tc.sig.c: Signal routine emulations */ @@ -32,7 +32,7 @@ */ #include "sh.h" -RCSID("$Id: tc.sig.c,v 3.26 2002/03/08 17:36:47 christos Exp $") +RCSID("$Id: tc.sig.c,v 3.29 2005/01/18 20:24:51 christos Exp $") #include "tc.wait.h" @@ -54,7 +54,7 @@ static int stk_ptr = -1; /* queue child signals */ -static sigret_t +static RETSIGTYPE sig_ch_queue() { # ifdef JOBDEBUG @@ -65,14 +65,11 @@ sig_ch_queue() stk[stk_ptr].s_pid = (pid_t) wait(&stk[stk_ptr].s_w); stk[stk_ptr].s_errno = errno; (void) signal(SIGCHLD, sig_ch_queue); -# ifndef SIGVOID - return(0); -# endif /* SIGVOID */ } /* process all awaiting child signals */ -static sigret_t +static RETSIGTYPE sig_ch_rel() { while (stk_ptr > -1) @@ -81,14 +78,11 @@ sig_ch_rel() xprintf("signal(SIGCHLD, pchild);\n"); # endif /* JOBDEBUG */ (void) signal(SIGCHLD, pchild); -# ifndef SIGVOID - return(0); -# endif /* SIGVOID */ } /* libc.a contains these functions in SYSVREL >= 3. */ -sigret_t +RETSIGTYPE (*xsigset(a, b)) () int a; signalfun_t b; @@ -181,7 +175,7 @@ ourwait(w) # ifdef COHERENT # undef signal -sigret_t +RETSIGTYPE (*xsignal(a, b)) () int a; signalfun_t b; @@ -221,7 +215,7 @@ sigpause(what) #ifdef NEEDsignal /* turn into bsd signals */ -sigret_t +RETSIGTYPE (*xsignal(s, a)) () int s; signalfun_t a; @@ -277,7 +271,7 @@ sigsetmask(mask) { sigset_t set, oset; int m; - register int i; + int i; (void) sigemptyset(&set); (void) sigemptyset(&oset); @@ -293,7 +287,7 @@ sigsetmask(mask) m = 0; for (i = 1; i <= MAXSIG; i++) - if (sigismember(&oset, i)) + if (sigismember(&oset, i) == 1) SETBIT(m, i); return (m); @@ -313,7 +307,7 @@ sigblock(mask) { sigset_t set, oset; int m; - register int i; + int i; (void) sigemptyset(&set); (void) sigemptyset(&oset); @@ -333,7 +327,7 @@ sigblock(mask) /* Return old mask to user. */ m = 0; for (i = 1; i <= MAXSIG; i++) - if (sigismember(&oset, i)) + if (sigismember(&oset, i) == 1) SETBIT(m, i); return (m); @@ -352,7 +346,7 @@ bsd_sigpause(mask) sigmask_t mask; { sigset_t set; - register int i; + int i; (void) sigemptyset(&set); @@ -367,7 +361,7 @@ bsd_sigpause(mask) * * Emulate bsd style signal() */ -sigret_t (*bsd_signal(sig, func)) () +RETSIGTYPE (*bsd_signal(sig, func)) () int sig; signalfun_t func; { @@ -403,7 +397,7 @@ sigret_t (*bsd_signal(sig, func)) () #ifdef SIGSYNCH static long Synch_Cnt = 0; -sigret_t +RETSIGTYPE synch_handler(sno) int sno; { |