X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=execute.c;h=8720af9e2579815420af8d4dd876391829f980c3;hb=65d2ebdc3408c81a947de8712b37b9398d955465;hp=db24ed9ee0a4493313f60e2b70d2b9ec7c91e7d3;hpb=66ee3769cb71e55bb9bea36348cb80282674a158;p=elogind.git
diff --git a/execute.c b/execute.c
index db24ed9ee..8720af9e2 100644
--- a/execute.c
+++ b/execute.c
@@ -1,6 +1,23 @@
/*-*- Mode: C; c-basic-offset: 8 -*-*/
-#pragma GCC diagnostic ignored "-Wattributes"
+/***
+ This file is part of systemd.
+
+ Copyright 2010 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with systemd; If not, see .
+***/
#include
#include
@@ -13,6 +30,8 @@
#include
#include
#include
+#include
+#include
#include "execute.h"
#include "strv.h"
@@ -113,7 +132,7 @@ static int shift_fds(int fds[], unsigned n_fds) {
return 0;
}
-static int flags_fds(int fds[], unsigned n_fds) {
+static int flags_fds(int fds[], unsigned n_fds, bool nonblock) {
unsigned i;
if (n_fds <= 0)
@@ -121,7 +140,7 @@ static int flags_fds(int fds[], unsigned n_fds) {
assert(fds);
- /* Drops 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++) {
int flags;
@@ -129,17 +148,20 @@ static int flags_fds(int fds[], unsigned n_fds) {
if ((flags = fcntl(fds[i], F_GETFL, 0)) < 0)
return -errno;
- /* Since we are at it, let's make sure that nobody
- * forgot setting O_NONBLOCK for all our fds */
+ if (nonblock)
+ flags |= O_NONBLOCK;
+ else
+ flags &= ~O_NONBLOCK;
- if (fcntl(fds[i], F_SETFL, flags &~O_NONBLOCK) < 0)
+ if (fcntl(fds[i], F_SETFL, flags) < 0)
return -errno;
+ /* 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;
- /* Also make sure nobody forgot O_CLOEXEC for all our
- * fds */
if (fcntl(fds[i], F_SETFD, flags &~FD_CLOEXEC) < 0)
return -errno;
}
@@ -250,7 +272,7 @@ static int setup_output(const ExecContext *context, const char *ident) {
}
}
-int setup_input(const ExecContext *context) {
+static int setup_input(const ExecContext *context) {
int r;
assert(context);
@@ -376,7 +398,7 @@ int exec_spawn(const ExecCommand *command, const ExecContext *context, int *fds,
if (close_fds(fds, n_fds) < 0 ||
shift_fds(fds, n_fds) < 0 ||
- flags_fds(fds, n_fds) < 0) {
+ flags_fds(fds, n_fds, context->non_blocking) < 0) {
r = EXIT_FDS;
goto fail;
}
@@ -533,10 +555,12 @@ void exec_context_dump(ExecContext *c, FILE* f, const char *prefix) {
fprintf(f,
"%sUMask: %04o\n"
"%sWorkingDirectory: %s\n"
- "%sRootDirectory: %s\n",
+ "%sRootDirectory: %s\n"
+ "%sNonBlocking: %s\n",
prefix, c->umask,
prefix, c->working_directory ? c->working_directory : "/",
- prefix, c->root_directory ? c->root_directory : "/");
+ prefix, c->root_directory ? c->root_directory : "/",
+ prefix, yes_no(c->non_blocking));
if (c->environment)
for (e = c->environment; *e; e++)