emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not complain if interrupted by a signal

Browse Source 
In start-stop-daemon and rc-schedules, we were printing out a warning if
the nanosleep call was interrupted by a signal, but we did not treat
this as an error situation other than displaying the message, so there
is no need for the message.
This commit is contained in:
William Hubbs 2018-11-14 17:44:03 -06:00
parent 7eb3975543
commit 2504a2c25b
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/rc/rc-schedules.c
View File

@ -376,10 +376,7 @@ int run_stop_schedule(const char *applet,
printf("\n"); printf("\n");
progressed = false; progressed = false;
} }
if (errno == EINTR) if (errno != EINTR) {
eerror("%s: caught an"
" interrupt", applet);
else {
eerror("%s: nanosleep: %s", eerror("%s: nanosleep: %s",
applet, strerror(errno)); applet, strerror(errno));
return 0; return 0;

4
src/rc/start-stop-daemon.c
View File

@ -996,9 +996,7 @@ int main(int argc, char **argv)
ts.tv_sec = start_wait / 1000; ts.tv_sec = start_wait / 1000;
ts.tv_nsec = (start_wait % 1000) * ONE_MS; ts.tv_nsec = (start_wait % 1000) * ONE_MS;
if (nanosleep(&ts, NULL) == -1) { if (nanosleep(&ts, NULL) == -1) {
if (errno == EINTR) if (errno != EINTR) {
eerror("%s: caught an interrupt", applet);
else {
eerror("%s: nanosleep: %s", eerror("%s: nanosleep: %s",
applet, strerror(errno)); applet, strerror(errno));
return 0; return 0;