X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fexit-status.h;h=1d774f25dca173c8a66b847988bbe388cfef7918;hp=9dc3fce0bf72ed7378f98ab8695a8d7fc5b082a1;hb=2ca620c4ed28c01f285d869d0b22f22a360957da;hpb=e66cf1a3f94fff48a572f6dbd19b43c9bcf7b8c7 diff --git a/src/shared/exit-status.h b/src/shared/exit-status.h index 9dc3fce0b..1d774f25d 100644 --- a/src/shared/exit-status.h +++ b/src/shared/exit-status.h @@ -22,7 +22,9 @@ ***/ #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,7 +64,7 @@ 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, @@ -72,7 +74,11 @@ typedef enum ExitStatus { EXIT_PERSONALITY, /* 230 */ EXIT_APPARMOR_PROFILE, EXIT_ADDRESS_FAMILIES, - EXIT_RUNTIME_DIRECTORY + EXIT_RUNTIME_DIRECTORY, + EXIT_MAKE_STARTER, + EXIT_CHOWN, + EXIT_BUS_ENDPOINT, + EXIT_SMACK_PROCESS_LABEL, } ExitStatus; typedef enum ExitStatusLevel { @@ -83,7 +89,7 @@ typedef enum ExitStatusLevel { } ExitStatusLevel; typedef struct ExitStatusSet { - Set *code; + Set *status; Set *signal; } ExitStatusSet; @@ -92,14 +98,5 @@ const char* exit_status_to_string(ExitStatus status, ExitStatusLevel level) _con bool is_clean_exit(int code, int status, ExitStatusSet *success_status); bool is_clean_exit_lsb(int code, int status, ExitStatusSet *success_status); -/* Manager status */ - -typedef enum ShowStatus { - _SHOW_STATUS_UNSET = -2, - SHOW_STATUS_AUTO = -1, - SHOW_STATUS_NO = 0, - SHOW_STATUS_YES = 1, - SHOW_STATUS_TEMPORARY = 2, -} ShowStatus; - -int parse_show_status(const char *v, ShowStatus *ret); +void exit_status_set_free(ExitStatusSet *x); +bool exit_status_set_is_empty(ExitStatusSet *x);