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

Change signal-handling to reset SIGCHLD to SIGDFLT instead of SIG_IGN.

Browse Source 
This fixes a problem with using print filters (if=, of=, etc) that showed
up in -current around June 20th.  That problem initially reported by
Georg-W Koltermann <gwk@sgi.com>, while most of the investigation that
led to this fix was done by Anton Berezin <tobez@FreeBSD.org>.

Reviewed by:	freebsd-print@bostonradio.org
MFC after:	1 week
This commit is contained in:
Garance A Drosehn 2001-07-14 21:49:17 +00:00
parent ce11a18f0e
commit bfb9fa63fc
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=79735
2 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usr.sbin/lpr/lpd/lpd.c
View File

@ -367,7 +367,12 @@ main(int argc, char **argv)
continue;
}
if (fork() == 0) {
signal(SIGCHLD, SIG_IGN);
/*
* Note that printjob() also plays around with
* signal-handling routines, and may need to be
* changed when making changes to signal-handling.
*/
signal(SIGCHLD, SIG_DFL);
signal(SIGHUP, SIG_IGN);
signal(SIGINT, SIG_IGN);
signal(SIGQUIT, SIG_IGN);

39
usr.sbin/lpr/lpd/printjob.c
View File

@ -165,6 +165,14 @@ printjob(struct printer *pp)
setgid(getegid());
pid = getpid(); /* for use with lprm */
setpgrp(0, pid);
/*
* At initial lpd startup, printjob may be called with various
* signal handlers in effect. After that initial startup, any
* calls to printjob will have a *different* set of signal-handlers
* in effect. Make sure all handlers are the ones we want.
*/
signal(SIGCHLD, SIG_DFL);
signal(SIGHUP, abortpr);
signal(SIGINT, abortpr);
signal(SIGQUIT, abortpr);
@ -284,6 +292,9 @@ printjob(struct printer *pp)
(void) close(ofd);
while ((i = wait(NULL)) > 0 && i != ofilter)
;
if (i < 0)
syslog(LOG_WARNING, "%s: after kill(of=%d), wait() returned: %m",
pp->printer, ofilter);
ofilter = 0;
}
(void) close(pfd); /* close printer */
@ -755,12 +766,15 @@ print(struct printer *pp, int format, char *file)
while ((pid =
wait3((int *)&status, WUNTRACED, 0)) > 0 && pid != ofilter)
;
if (status.w_stopval != WSTOPPED) {
if (pid < 0)
syslog(LOG_WARNING, "%s: after stopping 'of', wait3() returned: %m",
pp->printer);
else if (status.w_stopval != WSTOPPED) {
(void) close(fi);
syslog(LOG_WARNING,
"%s: output filter died "
"(retcode=%d termsig=%d)",
pp->printer, status.w_retcode,
"(pid=%d retcode=%d termsig=%d)",
pp->printer, ofilter, status.w_retcode,
status.w_termsig);
return(REPRINT);
}
@ -784,9 +798,15 @@ print(struct printer *pp, int format, char *file)
(void) close(fi);
if (child < 0)
status.w_retcode = 100;
else
else {
while ((pid = wait((int *)&status)) > 0 && pid != child)
;
if (pid < 0) {
status.w_retcode = 100;
syslog(LOG_WARNING, "%s: after execv(%s), wait() returned: %m",
pp->printer, prog);
}
}
child = 0;
prchild = 0;
if (stopped) { /* restart output filter */
@ -1024,10 +1044,16 @@ sendfile(struct printer *pp, int type, char *file, char format)
(void) close(f);
if (ifilter < 0)
status.w_retcode = 100;
else
else {
while ((pid = wait((int *)&status)) > 0 &&
pid != ifilter)
;
if (pid < 0) {
status.w_retcode = 100;
syslog(LOG_WARNING, "%s: after execv(%s), wait() returned: %m",
pp->printer, pp->filters[LPF_INPUT]);
}
}
/* Copy the filter's output to "lf" logfile */
if ((fp = fopen(tempstderr, "r"))) {
while (fgets(buf, sizeof(buf), fp))
@ -1083,6 +1109,9 @@ sendfile(struct printer *pp, int type, char *file, char format)
close(f);
while ((i = wait(NULL)) > 0 && i != ofilter)
;
if (i < 0)
syslog(LOG_WARNING, "%s: after closing 'of', wait() returned: %m",
pp->printer);
ofilter = 0;
statrc = fstat(tfd, &stb); /* to find size of tfile */
if (statrc < 0) {