mount: fix loop exit

[elogind.git] / execute.c

diff --git a/execute.c b/execute.c
index ae32bcadac53f871a485729eb19b6b097a06323d..4c6aa4eea98cc1f1703c483ab18d2385a2b59f98 100644 (file)
--- a/execute.c
+++ b/execute.c
@@ -1,5 +1,24 @@
 /*-*- Mode: C; c-basic-offset: 8 -*-*/
 
+/***
+  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 <http://www.gnu.org/licenses/>.
+***/
+
 #include <assert.h>
 #include <dirent.h>
 #include <errno.h>
@@ -10,7 +29,9 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/prctl.h>
-#include <sched.h>
+#include <linux/sched.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #include "execute.h"
 #include "strv.h"
@@ -111,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)
@@ -119,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;
@@ -127,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;
         }
@@ -248,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);
@@ -347,7 +371,8 @@ int exec_spawn(const ExecCommand *command, const ExecContext *context, int *fds,
                         zero(param);
                         param.sched_priority = context->cpu_sched_priority;
 
-                        if (sched_setscheduler(0, context->cpu_sched_policy, &param) < 0) {
+                        if (sched_setscheduler(0, context->cpu_sched_policy |
+                                               (context->cpu_sched_reset_on_fork ? SCHED_RESET_ON_FORK : 0), &param) < 0) {
                                 r = EXIT_SETSCHEDULER;
                                 goto fail;
                         }
@@ -373,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;
                 }
@@ -530,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++)
@@ -563,9 +590,11 @@ void exec_context_dump(ExecContext *c, FILE* f, const char *prefix) {
         if (c->cpu_sched_set)
                 fprintf(f,
                         "%sCPUSchedulingPolicy: %s\n"
-                        "%sCPUSchedulingPriority: %i\n",
+                        "%sCPUSchedulingPriority: %i\n"
+                        "%sCPUSchedulingResetOnFork: %s\n",
                         prefix, sched_policy_to_string(c->cpu_sched_policy),
-                        prefix, c->cpu_sched_priority);
+                        prefix, c->cpu_sched_priority,
+                        prefix, yes_no(c->cpu_sched_reset_on_fork));
 
         if (c->cpu_affinity_set) {
                 fprintf(f, "%sCPUAffinity:", prefix);
@@ -720,6 +749,20 @@ void exec_command_dump_list(ExecCommand *c, FILE *f, const char *prefix) {
                 exec_command_dump(c, f, prefix);
 }
 
+void exec_command_append_list(ExecCommand **l, ExecCommand *e) {
+        ExecCommand *end;
+
+        assert(l);
+        assert(e);
+
+        if (*l) {
+                /* It's kinda important that we keep the order here */
+                LIST_FIND_TAIL(ExecCommand, command, *l, end);
+                LIST_INSERT_AFTER(ExecCommand, command, *l, end, e);
+        } else
+              *l = e;
+}
+
 static const char* const exec_output_table[_EXEC_OUTPUT_MAX] = {
         [EXEC_OUTPUT_CONSOLE] = "console",
         [EXEC_OUTPUT_NULL] = "null",