summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-04-06 21:53:39 +0200
committerLennart Poettering <lennart@poettering.net>2010-04-06 21:53:39 +0200
commite2c76839a3f6444072ae452605204c7113ffdc37 (patch)
tree2266f54020abe903fed365d93690f791d67dc538
parent3a0ecb08f4b3bfa84ff3d04bc7816730df35139e (diff)
execute: use fd_nonblock()//fd_cloexec() where applicable
-rw-r--r--execute.c20
1 files changed, 5 insertions, 15 deletions
diff --git a/execute.c b/execute.c
index dd36038c4a..02f53dc485 100644
--- a/execute.c
+++ b/execute.c
@@ -137,6 +137,7 @@ static int shift_fds(int fds[], unsigned n_fds) {
static int flags_fds(int fds[], unsigned n_fds, bool nonblock) {
unsigned i;
+ int r;
if (n_fds <= 0)
return 0;
@@ -146,27 +147,16 @@ static int flags_fds(int fds[], unsigned n_fds, bool nonblock) {
/* Drops/Sets O_NONBLOCK and FD_CLOEXEC from the file flags */
for (i = 0; i < n_fds; i++) {
- int flags;
-
- if ((flags = fcntl(fds[i], F_GETFL, 0)) < 0)
- return -errno;
-
- if (nonblock)
- flags |= O_NONBLOCK;
- else
- flags &= ~O_NONBLOCK;
- if (fcntl(fds[i], F_SETFL, flags) < 0)
- return -errno;
+ if ((r = fd_nonblock(fds[i], nonblock)) < 0)
+ return r;
/* We unconditionally drop FD_CLOEXEC from the fds,
* since after all we want to pass these fds to our
* children */
- if ((flags = fcntl(fds[i], F_GETFD, 0)) < 0)
- return -errno;
- if (fcntl(fds[i], F_SETFD, flags &~FD_CLOEXEC) < 0)
- return -errno;
+ if ((r = fd_cloexec(fds[i], false)) < 0)
+ return r;
}
return 0;