picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

util: make sure reset_all_signal_handlers() continues with all other signal handlers when one sigaction() fails

Browse source 
After all, we usually don't check for failures here, and it is better to
do as much as we can...
This commit is contained in:
Lennart Poettering 2014-08-26 21:03:20 +02:00
parent f2322f0b64
commit 24a5d6b04e
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/shared/util.c
View file

@ -937,7 +937,7 @@ int readlink_and_canonicalize(const char *p, char **r) {
}
int reset_all_signal_handlers(void) {
int sig;
int sig, r = 0;
for (sig = 1; sig < _NSIG; sig++) {
struct sigaction sa = {
@ -945,17 +945,18 @@ int reset_all_signal_handlers(void) {
.sa_flags = SA_RESTART,
};
/* These two cannot be caught... */
if (sig == SIGKILL || sig == SIGSTOP)
continue;
/* On Linux the first two RT signals are reserved by
* glibc, and sigaction() will return EINVAL for them. */
if ((sigaction(sig, &sa, NULL) < 0))
if (errno != EINVAL)
return -errno;
if (errno != EINVAL && r == 0)
r = -errno;
}
return 0;
return r;
}
char *strstrip(char *s) {