X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=execute.h;h=d2ac4a82e006cbc1cabab6d57f86c5bf375d6ac9;hb=40531a555ae313543c0fbb80137edbae71eee773;hp=3e332105c1ab15f12bea9d4b82a95e76b15a995c;hpb=a6a80b4f440bcc1c6087572503c08a72ee674075;p=elogind.git

diff --git a/execute.h b/execute.h
index 3e332105c..d2ac4a82e 100644
--- a/execute.h
+++ b/execute.h
@@ -33,31 +33,37 @@ typedef struct ExecContext ExecContext;
 #include <stdio.h>
 #include <sched.h>
 
+struct CGroupBonding;
+
 #include "list.h"
 #include "util.h"
 
 /* Abstract namespace! */
-#define LOGGER_SOCKET "/org/freedesktop.org/systemd1/logger"
+#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_MAX,
+        _EXEC_INPUT_INVALID = -1
+} ExecInput;
 
 typedef enum ExecOutput {
-        EXEC_OUTPUT_CONSOLE,
+        EXEC_OUTPUT_INHERIT,
         EXEC_OUTPUT_NULL,
+        EXEC_OUTPUT_TTY,
         EXEC_OUTPUT_SYSLOG,
         EXEC_OUTPUT_KERNEL,
         _EXEC_OUTPUT_MAX,
         _EXEC_OUTPUT_INVALID = -1
 } ExecOutput;
 
-typedef enum ExecInput {
-        EXEC_INPUT_NULL,
-        EXEC_INPUT_CONSOLE,
-        _EXEC_INPUT_MAX,
-        _EXEC_INPUT_INVALID = -1
-} ExecInput;
-
 struct ExecStatus {
         pid_t pid;
-        usec_t timestamp;
+        usec_t start_timestamp;
+        usec_t exit_timestamp;
         int code;     /* as in siginfo_t::si_code */
         int status;   /* as in sigingo_t::si_status */
 };
@@ -92,12 +98,15 @@ struct ExecContext {
         bool cpu_sched_reset_on_fork;
         bool non_blocking;
 
-        ExecInput input;
-        ExecOutput output;
+        ExecInput std_input;
+        ExecOutput std_output;
+        ExecOutput std_error;
+
+        char *tty_path;
+
         int syslog_priority;
         char *syslog_identifier;
 
-        /* FIXME: all privs related settings need to be enforced */
         cap_t capabilities;
         int secure_bits;
         uint64_t capability_bounding_set_drop;
@@ -135,18 +144,35 @@ typedef enum ExitStatus {
         EXIT_LIMITS,
         EXIT_OOM_ADJUST,
         EXIT_SIGNAL_MASK,
-        EXIT_INPUT,
-        EXIT_OUTPUT,
-        EXIT_CHROOT,
-        EXIT_PGID,
+        EXIT_STDIN,
+        EXIT_STDOUT,
+        EXIT_CHROOT,   /* 210 */
         EXIT_IOPRIO,
         EXIT_TIMERSLACK,
         EXIT_SECUREBITS,
         EXIT_SETSCHEDULER,
-        EXIT_CPUAFFINITY
+        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,
+               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);
@@ -155,12 +181,14 @@ char *exec_command_line(ExecCommand *c);
 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);
@@ -168,4 +196,6 @@ 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