X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=execute.h;h=f820d56cb85a2ba5e21301b3786a2288a9ff5f0b;hb=1005d14f4a6d5bd8f035169cb5df4c890284f211;hp=d339af93dccba082c1af49da277eb8ab5035c63a;hpb=44d8db9e5aa86165c97289f6c78a7e42bac78362;p=elogind.git
diff --git a/execute.h b/execute.h
index d339af93d..f820d56cb 100644
--- a/execute.h
+++ b/execute.h
@@ -3,6 +3,25 @@
#ifndef fooexecutehfoo
#define fooexecutehfoo
+/***
+ 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 .
+***/
+
typedef struct ExecStatus ExecStatus;
typedef struct ExecCommand ExecCommand;
typedef struct ExecContext ExecContext;
@@ -12,13 +31,41 @@ typedef struct ExecContext ExecContext;
#include
#include
#include
+#include
+
+struct CGroupBonding;
#include "list.h"
#include "util.h"
+/* Abstract namespace! */
+#define LOGGER_SOCKET "/org/freedesktop/systemd1/logger"
+
+typedef enum ExecInput {
+ EXEC_INPUT_NULL,
+ EXEC_INPUT_TTY,
+ EXEC_INPUT_TTY_FORCE,
+ EXEC_INPUT_TTY_FAIL,
+ EXEC_INPUT_SOCKET,
+ _EXEC_INPUT_MAX,
+ _EXEC_INPUT_INVALID = -1
+} ExecInput;
+
+typedef enum ExecOutput {
+ EXEC_OUTPUT_INHERIT,
+ EXEC_OUTPUT_NULL,
+ EXEC_OUTPUT_TTY,
+ EXEC_OUTPUT_SYSLOG,
+ EXEC_OUTPUT_KERNEL,
+ EXEC_OUTPUT_SOCKET,
+ _EXEC_OUTPUT_MAX,
+ _EXEC_OUTPUT_INVALID = -1
+} ExecOutput;
+
struct ExecStatus {
+ usec_t start_timestamp;
+ usec_t exit_timestamp;
pid_t pid;
- usec_t timestamp;
int code; /* as in siginfo_t::si_code */
int status; /* as in sigingo_t::si_status */
};
@@ -32,21 +79,61 @@ struct ExecCommand {
struct ExecContext {
char **environment;
- mode_t umask;
struct rlimit *rlimit[RLIMIT_NLIMITS];
+ char *working_directory, *root_directory;
+
+ mode_t umask;
int oom_adjust;
int nice;
- char *directory;
+ int ioprio;
+ int cpu_sched_policy;
+ int cpu_sched_priority;
- cap_t capabilities;
- bool capabilities_set:1;
+ cpu_set_t cpu_affinity;
+ unsigned long timer_slack_ns;
+
+ ExecInput std_input;
+ ExecOutput std_output;
+ ExecOutput std_error;
- /* since resolving these names might might involve socket
+ int syslog_priority;
+ char *syslog_identifier;
+
+ char *tty_path;
+
+ /* Since resolving these names might might involve socket
* connections and we don't want to deadlock ourselves these
- * names are resolved on execution only. */
+ * names are resolved on execution only and in the child
+ * process. */
char *user;
char *group;
char **supplementary_groups;
+
+ char **read_write_dirs, **read_only_dirs, **inaccessible_dirs;
+ unsigned long mount_flags;
+
+ uint64_t capability_bounding_set_drop;
+
+ cap_t capabilities;
+ int secure_bits;
+
+ bool cpu_sched_reset_on_fork;
+ bool non_blocking;
+ bool private_tmp;
+
+ bool oom_adjust_set:1;
+ bool nice_set:1;
+ bool ioprio_set:1;
+ bool cpu_sched_set:1;
+ bool cpu_affinity_set:1;
+ bool timer_slack_ns_set:1;
+
+ /* This is not exposed to the user but available
+ * internally. We need it to make sure that whenever we spawn
+ * /bin/mount it is run in the same process group as us so
+ * that the autofs logic detects that it belongs to us and we
+ * don't enter a trigger loop. */
+ bool no_setsid:1;
};
typedef enum ExitStatus {
@@ -71,22 +158,62 @@ typedef enum ExitStatus {
EXIT_EXEC,
EXIT_MEMORY,
EXIT_LIMITS,
- EXIT_OOM_ADJUST
+ EXIT_OOM_ADJUST,
+ EXIT_SIGNAL_MASK,
+ EXIT_STDIN,
+ EXIT_STDOUT,
+ EXIT_CHROOT, /* 210 */
+ EXIT_IOPRIO,
+ EXIT_TIMERSLACK,
+ EXIT_SECUREBITS,
+ EXIT_SETSCHEDULER,
+ EXIT_CPUAFFINITY,
+ EXIT_GROUP,
+ EXIT_USER,
+ EXIT_CAPABILITIES,
+ EXIT_CGROUP,
+ EXIT_SETSID, /* 220 */
+ EXIT_CONFIRM,
+ EXIT_STDERR
+
} ExitStatus;
-int exec_spawn(const ExecCommand *command, const ExecContext *context, int *fds, unsigned n_fds, pid_t *ret);
+int exec_spawn(ExecCommand *command,
+ char **argv,
+ const ExecContext *context,
+ int fds[], unsigned n_fds,
+ bool apply_permissions,
+ bool apply_chroot,
+ bool confirm_spawn,
+ struct CGroupBonding *cgroup_bondings,
+ pid_t *ret);
+
+void exec_command_done(ExecCommand *c);
+void exec_command_done_array(ExecCommand *c, unsigned n);
void exec_command_free_list(ExecCommand *c);
void exec_command_free_array(ExecCommand **c, unsigned n);
-char *exec_command_line(ExecCommand *c);
+char *exec_command_line(char **argv);
+
void exec_command_dump(ExecCommand *c, FILE *f, const char *prefix);
void exec_command_dump_list(ExecCommand *c, FILE *f, const char *prefix);
+void exec_command_append_list(ExecCommand **l, ExecCommand *e);
+int exec_command_set(ExecCommand *c, const char *path, ...);
void exec_context_init(ExecContext *c);
void exec_context_done(ExecContext *c);
void exec_context_dump(ExecContext *c, FILE* f, const char *prefix);
void exec_status_fill(ExecStatus *s, pid_t pid, int code, int status);
+void exec_status_dump(ExecStatus *s, FILE *f, const char *prefix);
+
+const char* exec_output_to_string(ExecOutput i);
+int exec_output_from_string(const char *s);
+
+const char* exec_input_to_string(ExecInput i);
+int exec_input_from_string(const char *s);
+
+const char* exit_status_to_string(ExitStatus status);
#endif