X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=execute.h;h=655f1e4f7b4aec9a66446a5e90c089d863ac7e25;hp=b4bb9600d1e691e8c697f2b2ed39e2dc98a308c6;hb=c9106f61d0755dc6b8aa7c4252baa140c2d473f1;hpb=43d0fcbd3f54a5f3c5636acf9b54f19a07de7a18

diff --git a/execute.h b/execute.h
index b4bb9600d..655f1e4f7 100644
--- a/execute.h
+++ b/execute.h
@@ -41,22 +41,27 @@ struct CGroupBonding;
 /* 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_CONSOLE,
+        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;
 
-typedef enum ExecInput {
-        EXEC_INPUT_NULL,
-        EXEC_INPUT_CONSOLE,
-        _EXEC_INPUT_MAX,
-        _EXEC_INPUT_INVALID = -1
-} ExecInput;
-
 struct ExecStatus {
         pid_t pid;
         usec_t start_timestamp;
@@ -92,12 +97,22 @@ struct ExecContext {
         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;
+
         bool cpu_sched_reset_on_fork;
         bool non_blocking;
-        bool new_session;
 
-        ExecInput input;
-        ExecOutput output;
+        ExecInput std_input;
+        ExecOutput std_output;
+        ExecOutput std_error;
+
+        char *tty_path;
+
         int syslog_priority;
         char *syslog_identifier;
 
@@ -138,10 +153,9 @@ typedef enum ExitStatus {
         EXIT_LIMITS,
         EXIT_OOM_ADJUST,
         EXIT_SIGNAL_MASK,
-        EXIT_INPUT,
-        EXIT_OUTPUT,
+        EXIT_STDIN,
+        EXIT_STDOUT,
         EXIT_CHROOT,   /* 210 */
-        EXIT_PGID,
         EXIT_IOPRIO,
         EXIT_TIMERSLACK,
         EXIT_SECUREBITS,
@@ -150,15 +164,20 @@ typedef enum ExitStatus {
         EXIT_GROUP,
         EXIT_USER,
         EXIT_CAPABILITIES,
-        EXIT_CGROUP,   /* 220 */
-        EXIT_SETSID
+        EXIT_CGROUP,
+        EXIT_SETSID,   /* 220 */
+        EXIT_CONFIRM,
+        EXIT_STDERR
+
 } ExitStatus;
 
 int exec_spawn(ExecCommand *command,
+               char **argv,
                const ExecContext *context,
-               int *fds, unsigned n_fds,
+               int fds[], unsigned n_fds,
                bool apply_permissions,
                bool apply_chroot,
+               bool confirm_spawn,
                struct CGroupBonding *cgroup_bondings,
                pid_t *ret);
 
@@ -168,7 +187,8 @@ 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);
@@ -187,4 +207,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