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

Set the signal handlers before creating the thread. This is so it inherits

Browse Source 
the parent's signal mask.  Once daemon() forked, signals would be ignored
in the child thread.  While I'm here, check the return value of daemon().
This fixes termination in the daemon case (bug introduced in last commit).

Noticed by:	Frederik Lindberg
This commit is contained in:
njl 2005-10-20 05:12:20 +00:00
parent af52aff9fb
commit cd579e831a
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
usr.sbin/powerd/powerd.c
View File

@ -479,6 +479,15 @@ main(int argc, char * argv[])
if (read_freqs(&numfreqs, &freqs, &mwatts))
err(1, "error reading supported CPU frequencies");
/*
* Exit cleanly on signals; devd may send a SIGPIPE if it dies. We
* do this before acline_init() since it may create a thread and we
* want it to inherit our signal mask.
*/
signal(SIGINT, handle_sigs);
signal(SIGTERM, handle_sigs);
signal(SIGPIPE, SIG_IGN);
/* Decide whether to use ACPI or APM to read the AC line status. */
acline_init();
@ -494,12 +503,14 @@ main(int argc, char * argv[])
}
warn("cannot open pid file");
}
daemon(0, 0);
if (daemon(0, 0) != 0) {
warn("cannot enter daemon mode, exiting");
pidfile_remove(pfh);
exit(EXIT_FAILURE);
}
pidfile_write(pfh);
}
signal(SIGINT, handle_sigs);
signal(SIGTERM, handle_sigs);
signal(SIGPIPE, SIG_IGN);
/* Main loop. */
for (;;) {