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_pipe() with new safe_close_pair()
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
bus-container.c
diff --git
a/src/libsystemd/sd-bus/bus-container.c
b/src/libsystemd/sd-bus/bus-container.c
index d330363b6f89dad199be3103ee36991e113dfcd2..6bd7ad6318dd732c47b9e1ab684e4600e05344cf 100644
(file)
--- a/
src/libsystemd/sd-bus/bus-container.c
+++ b/
src/libsystemd/sd-bus/bus-container.c
@@
-116,7
+116,7
@@
int bus_container_connect_socket(sd_bus *b) {
}
int bus_container_connect_kernel(sd_bus *b) {
}
int bus_container_connect_kernel(sd_bus *b) {
- _cleanup_close_p
ipe
_ int pair[2] = { -1, -1 };
+ _cleanup_close_p
air
_ int pair[2] = { -1, -1 };
_cleanup_close_ int pidnsfd = -1, mntnsfd = -1, rootfd = -1;
union {
struct cmsghdr cmsghdr;
_cleanup_close_ int pidnsfd = -1, mntnsfd = -1, rootfd = -1;
union {
struct cmsghdr cmsghdr;
@@
-154,8
+154,7
@@
int bus_container_connect_kernel(sd_bus *b) {
if (child == 0) {
pid_t grandchild;
if (child == 0) {
pid_t grandchild;
- close_nointr_nofail(pair[0]);
- pair[0] = -1;
+ pair[0] = safe_close(pair[0]);
r = namespace_enter(pidnsfd, mntnsfd, rootfd);
if (r < 0)
r = namespace_enter(pidnsfd, mntnsfd, rootfd);
if (r < 0)
@@
-202,8
+201,7
@@
int bus_container_connect_kernel(sd_bus *b) {
_exit(si.si_status);
}
_exit(si.si_status);
}
- close_nointr_nofail(pair[1]);
- pair[1] = -1;
+ pair[1] = safe_close(pair[1]);
r = wait_for_terminate(child, &si);
if (r < 0)
r = wait_for_terminate(child, &si);
if (r < 0)