X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fexit-status.h;h=1d774f25dca173c8a66b847988bbe388cfef7918;hp=3f42c15e3b97d071dd4b9483896a4c51b3e9e8d6;hb=0c124f8b2c93d2c7d6eefca3bdc59b28250fc077;hpb=c2f1db8f83618e60dcded8303d14656d7d26b436 diff --git a/src/shared/exit-status.h b/src/shared/exit-status.h index 3f42c15e3..1d774f25d 100644 --- a/src/shared/exit-status.h +++ b/src/shared/exit-status.h @@ -23,6 +23,8 @@ #include +#include "set.h" + typedef enum ExitStatus { /* EXIT_SUCCESS defined by libc */ /* EXIT_FAILURE defined by libc */ @@ -37,7 +39,7 @@ typedef enum ExitStatus { * use them here under the assumption that they hence are * unused by init scripts. * - * http://refspecs.freestandards.org/LSB_3.1.0/LSB-Core-generic/LSB-Core-generic/iniscrptact.html */ + * http://refspecs.linuxfoundation.org/LSB_3.2.0/LSB-Core-generic/LSB-Core-generic/iniscrptact.html */ EXIT_CHDIR = 200, EXIT_NICE, @@ -62,12 +64,21 @@ typedef enum ExitStatus { EXIT_SETSID, /* 220 */ EXIT_CONFIRM, EXIT_STDERR, - EXIT_TCPWRAP, + _EXIT_RESERVED, /* used to be tcpwrap, don't reuse! */ EXIT_PAM, EXIT_NETWORK, EXIT_NAMESPACE, EXIT_NO_NEW_PRIVILEGES, - EXIT_SECCOMP + EXIT_SECCOMP, + EXIT_SELINUX_CONTEXT, + EXIT_PERSONALITY, /* 230 */ + EXIT_APPARMOR_PROFILE, + EXIT_ADDRESS_FAMILIES, + EXIT_RUNTIME_DIRECTORY, + EXIT_MAKE_STARTER, + EXIT_CHOWN, + EXIT_BUS_ENDPOINT, + EXIT_SMACK_PROCESS_LABEL, } ExitStatus; typedef enum ExitStatusLevel { @@ -77,7 +88,15 @@ typedef enum ExitStatusLevel { EXIT_STATUS_FULL = EXIT_STATUS_LSB } ExitStatusLevel; -const char* exit_status_to_string(ExitStatus status, ExitStatusLevel level); +typedef struct ExitStatusSet { + Set *status; + Set *signal; +} ExitStatusSet; + +const char* exit_status_to_string(ExitStatus status, ExitStatusLevel level) _const_; + +bool is_clean_exit(int code, int status, ExitStatusSet *success_status); +bool is_clean_exit_lsb(int code, int status, ExitStatusSet *success_status); -bool is_clean_exit(int code, int status); -bool is_clean_exit_lsb(int code, int status); +void exit_status_set_free(ExitStatusSet *x); +bool exit_status_set_is_empty(ExitStatusSet *x);