d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't assume sigset_t and int are equivalent. Also, get

Browse Source 
sigprocmask arguments the right way round.
This commit is contained in:
James Raynard 1998-02-28 15:14:00 +00:00
parent 37c77f547a
commit 194787f381
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=33921
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
usr.sbin/syslogd/syslogd.c
View File

@ -42,7 +42,7 @@ static const char copyright[] =
static char sccsid[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94";
#endif
static const char rcsid[] =
"$Id$";
"$Id: syslogd.c,v 1.27 1997/10/20 12:55:49 charnier Exp $";
#endif /* not lint */
/*
@ -1668,11 +1668,13 @@ p_open(prog, pid)
/* we are royally screwed anyway */
return -1;
mask = sigmask(SIGALRM) | sigmask(SIGHUP);
sigprocmask(SIG_BLOCK, &omask, &mask);
sigemptyset(&mask);
sigaddset(&mask, SIGALRM);
sigaddset(&mask, SIGHUP);
sigprocmask(SIG_BLOCK, &mask, &omask);
switch ((*pid = fork())) {
case -1:
sigprocmask(SIG_SETMASK, 0, &omask);
sigprocmask(SIG_SETMASK, &omask, 0);
close(nulldesc);
return -1;
@ -1691,7 +1693,7 @@ p_open(prog, pid)
*/
signal(SIGALRM, SIG_IGN);
signal(SIGHUP, SIG_IGN);
sigprocmask(SIG_SETMASK, 0, &omask);
sigprocmask(SIG_SETMASK, &omask, 0);
signal(SIGPIPE, SIG_DFL);
signal(SIGQUIT, SIG_DFL);
signal(SIGALRM, SIG_DFL);
@ -1707,7 +1709,7 @@ p_open(prog, pid)
_exit(255);
}
sigprocmask(SIG_SETMASK, 0, &omask);
sigprocmask(SIG_SETMASK, &omask, 0);
close(nulldesc);
close(pfd[0]);
/*