chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: replace close_nointr_nofail() by a more useful safe_close()
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
bus-socket.c
diff --git
a/src/libsystemd/sd-bus/bus-socket.c
b/src/libsystemd/sd-bus/bus-socket.c
index 016f8a1c9f9d34a605d6093e753fd34fd073fcd3..bccf50122213aa43509c95fe856ddcf9bbd79bec 100644
(file)
--- a/
src/libsystemd/sd-bus/bus-socket.c
+++ b/
src/libsystemd/sd-bus/bus-socket.c
@@
-750,7
+750,7
@@
int bus_socket_exec(sd_bus *b) {
assert_se(dup3(s[1], STDOUT_FILENO, 0) == STDOUT_FILENO);
if (s[1] != STDIN_FILENO && s[1] != STDOUT_FILENO)
assert_se(dup3(s[1], STDOUT_FILENO, 0) == STDOUT_FILENO);
if (s[1] != STDIN_FILENO && s[1] != STDOUT_FILENO)
-
close_nointr_nofail
(s[1]);
+
safe_close
(s[1]);
fd_cloexec(STDIN_FILENO, false);
fd_cloexec(STDOUT_FILENO, false);
fd_cloexec(STDIN_FILENO, false);
fd_cloexec(STDOUT_FILENO, false);
@@
-767,7
+767,7
@@
int bus_socket_exec(sd_bus *b) {
_exit(EXIT_FAILURE);
}
_exit(EXIT_FAILURE);
}
-
close_nointr_nofail
(s[1]);
+
safe_close
(s[1]);
b->output_fd = b->input_fd = s[0];
bus_socket_setup(b);
b->output_fd = b->input_fd = s[0];
bus_socket_setup(b);