projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3164e3c
)
core: don't wait for reply if writing to pipe fails
author
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Sat, 14 Mar 2015 02:20:53 +0000
(21:20 -0500)
committer
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Sat, 14 Mar 2015 03:42:17 +0000
(23:42 -0400)
This shouldn't really happen, but it's seems cleaner to
continue on error.
CID #1237552.
src/core/execute.c
patch
|
blob
|
history
diff --git
a/src/core/execute.c
b/src/core/execute.c
index
39ec5ad
..
02df51b
100644
(file)
--- a/
src/core/execute.c
+++ b/
src/core/execute.c
@@
-1159,10
+1159,10
@@
static void do_idle_pipe_dance(int idle_pipe[4]) {
if (idle_pipe[3] >= 0 && r == 0 /* timeout */) {
/* Signal systemd that we are bored and want to continue. */
- write(idle_pipe[3], "x", 1);
-
- /* Wait for systemd to react to the signal above. */
- fd_wait_for_event(idle_pipe[0], POLLHUP, IDLE_TIMEOUT2_USEC);
+
r =
write(idle_pipe[3], "x", 1);
+ if (r > 0)
+
/* Wait for systemd to react to the signal above. */
+
fd_wait_for_event(idle_pipe[0], POLLHUP, IDLE_TIMEOUT2_USEC);
}
safe_close(idle_pipe[0]);