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: make chain of main commands and control commands independent of each other...
[elogind.git]
/
src
/
execute.h
diff --git
a/src/execute.h
b/src/execute.h
index b612145027e1c2c69c771aa390fb54ac2d36316b..a6766f9e995b0ed799dc9be37aefdd47636ab0f3 100644
(file)
--- a/
src/execute.h
+++ b/
src/execute.h
@@
-55,6
+55,14
@@
typedef enum KillMode {
_KILL_MODE_INVALID = -1
} KillMode;
_KILL_MODE_INVALID = -1
} KillMode;
+typedef enum KillWho {
+ KILL_MAIN,
+ KILL_CONTROL,
+ KILL_ALL,
+ _KILL_WHO_MAX,
+ _KILL_WHO_INVALID = -1
+} KillWho;
+
typedef enum ExecInput {
EXEC_INPUT_NULL,
EXEC_INPUT_TTY,
typedef enum ExecInput {
EXEC_INPUT_NULL,
EXEC_INPUT_TTY,
@@
-127,6
+135,8
@@
struct ExecContext {
char *pam_name;
char *pam_name;
+ char *utmp_id;
+
char **read_write_dirs, **read_only_dirs, **inaccessible_dirs;
unsigned long mount_flags;
char **read_write_dirs, **read_only_dirs, **inaccessible_dirs;
unsigned long mount_flags;
@@
-135,6
+145,7
@@
struct ExecContext {
/* Not relevant for spawning processes, just for killing */
KillMode kill_mode;
int kill_signal;
/* Not relevant for spawning processes, just for killing */
KillMode kill_mode;
int kill_signal;
+ bool send_sigkill;
cap_t capabilities;
int secure_bits;
cap_t capabilities;
int secure_bits;
@@
-191,7
+202,7
@@
void exec_context_done(ExecContext *c);
void exec_context_dump(ExecContext *c, FILE* f, const char *prefix);
void exec_status_start(ExecStatus *s, pid_t pid);
void exec_context_dump(ExecContext *c, FILE* f, const char *prefix);
void exec_status_start(ExecStatus *s, pid_t pid);
-void exec_status_exit(ExecStatus *s, pid_t pid, int code, int status);
+void exec_status_exit(ExecStatus *s, pid_t pid, int code, int status
, const char *utmp_id
);
void exec_status_dump(ExecStatus *s, FILE *f, const char *prefix);
const char* exec_output_to_string(ExecOutput i);
void exec_status_dump(ExecStatus *s, FILE *f, const char *prefix);
const char* exec_output_to_string(ExecOutput i);
@@
-200,4
+211,10
@@
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 *kill_mode_to_string(KillMode k);
+KillMode kill_mode_from_string(const char *s);
+
+const char *kill_who_to_string(KillWho k);
+KillWho kill_who_from_string(const char *s);
+
#endif
#endif