chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
service: add basic validation hooks
[elogind.git]
/
execute.h
diff --git
a/execute.h
b/execute.h
index b4bb9600d1e691e8c697f2b2ed39e2dc98a308c6..d2ac4a82e006cbc1cabab6d57f86c5bf375d6ac9 100644
(file)
--- a/
execute.h
+++ b/
execute.h
@@
-41,22
+41,25
@@
struct CGroupBonding;
/* Abstract namespace! */
#define LOGGER_SOCKET "/org/freedesktop/systemd1/logger"
/* 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_MAX,
+ _EXEC_INPUT_INVALID = -1
+} ExecInput;
+
typedef enum ExecOutput {
typedef enum ExecOutput {
- EXEC_OUTPUT_
CONSOLE
,
+ EXEC_OUTPUT_
INHERIT
,
EXEC_OUTPUT_NULL,
EXEC_OUTPUT_NULL,
+ EXEC_OUTPUT_TTY,
EXEC_OUTPUT_SYSLOG,
EXEC_OUTPUT_KERNEL,
_EXEC_OUTPUT_MAX,
_EXEC_OUTPUT_INVALID = -1
} ExecOutput;
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 start_timestamp;
struct ExecStatus {
pid_t pid;
usec_t start_timestamp;
@@
-94,10
+97,13
@@
struct ExecContext {
bool cpu_sched_reset_on_fork;
bool non_blocking;
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;
int syslog_priority;
char *syslog_identifier;
@@
-138,10
+144,9
@@
typedef enum ExitStatus {
EXIT_LIMITS,
EXIT_OOM_ADJUST,
EXIT_SIGNAL_MASK,
EXIT_LIMITS,
EXIT_OOM_ADJUST,
EXIT_SIGNAL_MASK,
- EXIT_
INPUT
,
- EXIT_
OUTP
UT,
+ EXIT_
STDIN
,
+ EXIT_
STDO
UT,
EXIT_CHROOT, /* 210 */
EXIT_CHROOT, /* 210 */
- EXIT_PGID,
EXIT_IOPRIO,
EXIT_TIMERSLACK,
EXIT_SECUREBITS,
EXIT_IOPRIO,
EXIT_TIMERSLACK,
EXIT_SECUREBITS,
@@
-150,8
+155,11
@@
typedef enum ExitStatus {
EXIT_GROUP,
EXIT_USER,
EXIT_CAPABILITIES,
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,
} ExitStatus;
int exec_spawn(ExecCommand *command,
@@
-159,6
+167,7
@@
int exec_spawn(ExecCommand *command,
int *fds, unsigned n_fds,
bool apply_permissions,
bool apply_chroot,
int *fds, unsigned n_fds,
bool apply_permissions,
bool apply_chroot,
+ bool confirm_spawn,
struct CGroupBonding *cgroup_bondings,
pid_t *ret);
struct CGroupBonding *cgroup_bondings,
pid_t *ret);
@@
-187,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* exec_input_to_string(ExecInput i);
int exec_input_from_string(const char *s);
+const char* exit_status_to_string(ExitStatus status);
+
#endif
#endif