shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-25 23:21:33 +03:00
Code

execute: use fd_nonblock()//fd_cloexec() where applicable

Browse Source
This commit is contained in:
Lennart Poettering 2010-04-06 21:53:39 +02:00
parent 3a0ecb08f4
commit e2c76839a3
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
execute.c
View File

@ -137,6 +137,7 @@ static int shift_fds(int fds[], unsigned n_fds) {
static int flags_fds(int fds[], unsigned n_fds, bool nonblock) { static int flags_fds(int fds[], unsigned n_fds, bool nonblock) {
unsigned i; unsigned i;
int r;
if (n_fds <= 0) if (n_fds <= 0)
return 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 */ /* Drops/Sets O_NONBLOCK and FD_CLOEXEC from the file flags */
for (i = 0; i < n_fds; i++) { for (i = 0; i < n_fds; i++) {
int flags;
if ((flags = fcntl(fds[i], F_GETFL, 0)) < 0) if ((r = fd_nonblock(fds[i], nonblock)) < 0)
return -errno; return r;
if (nonblock)
flags |= O_NONBLOCK;
else
flags &= ~O_NONBLOCK;
if (fcntl(fds[i], F_SETFL, flags) < 0)
return -errno;
/* We unconditionally drop FD_CLOEXEC from the fds, /* We unconditionally drop FD_CLOEXEC from the fds,
* since after all we want to pass these fds to our * since after all we want to pass these fds to our
* children */ * children */
if ((flags = fcntl(fds[i], F_GETFD, 0)) < 0)
return -errno;
if (fcntl(fds[i], F_SETFD, flags &~FD_CLOEXEC) < 0) if ((r = fd_cloexec(fds[i], false)) < 0)
return -errno; return r;
} }
return 0; return 0;