X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fexit-status.c;h=57022c5b8aebd2b523df640f801683548acad59e;hb=81dcadefd3afee8ea2a38090093f735d11d99009;hp=70789f51367e9e7f23852bedc6ac6823d3adea8d;hpb=7b52a628f8b43ba521c302a7f32bccf9d0dc8bfd;p=elogind.git

diff --git a/src/shared/exit-status.c b/src/shared/exit-status.c
index 70789f513..57022c5b8 100644
--- a/src/shared/exit-status.c
+++ b/src/shared/exit-status.c
@@ -20,7 +20,6 @@
 ***/
 
 #include <stdlib.h>
-#include <sys/wait.h>
 
 #include "exit-status.h"
 #include "set.h"
@@ -113,9 +112,6 @@ const char* exit_status_to_string(ExitStatus status, ExitStatusLevel level) {
                 case EXIT_STDERR:
                         return "STDERR";
 
-                case EXIT_TCPWRAP:
-                        return "TCPWRAP";
-
                 case EXIT_PAM:
                         return "PAM";
 
@@ -133,6 +129,27 @@ const char* exit_status_to_string(ExitStatus status, ExitStatusLevel level) {
 
                 case EXIT_SELINUX_CONTEXT:
                         return "SELINUX_CONTEXT";
+
+                case EXIT_PERSONALITY:
+                        return "PERSONALITY";
+
+                case EXIT_APPARMOR_PROFILE:
+                        return "APPARMOR";
+
+                case EXIT_ADDRESS_FAMILIES:
+                        return "ADDRESS_FAMILIES";
+
+                case EXIT_RUNTIME_DIRECTORY:
+                        return "RUNTIME_DIRECTORY";
+
+                case EXIT_CHOWN:
+                        return "CHOWN";
+
+                case EXIT_MAKE_STARTER:
+                        return "MAKE_STARTER";
+
+                case EXIT_BUS_ENDPOINT:
+                        return "BUS_ENDPOINT";
                 }
         }
 
@@ -168,7 +185,7 @@ bool is_clean_exit(int code, int status, ExitStatusSet *success_status) {
         if (code == CLD_EXITED)
                 return status == 0 ||
                        (success_status &&
-                       set_contains(success_status->code, INT_TO_PTR(status)));
+                       set_contains(success_status->status, INT_TO_PTR(status)));
 
         /* If a daemon does not implement handlers for some of the
          * signals that's not considered an unclean shutdown */
@@ -194,19 +211,17 @@ bool is_clean_exit_lsb(int code, int status, ExitStatusSet *success_status) {
                 (status == EXIT_NOTINSTALLED || status == EXIT_NOTCONFIGURED);
 }
 
-int parse_show_status(const char *v, ShowStatus *ret) {
-        int r;
+void exit_status_set_free(ExitStatusSet *x) {
+        assert(x);
+
+        set_free(x->status);
+        set_free(x->signal);
+        x->status = x->signal = NULL;
+}
 
-        assert(v);
-        assert(ret);
+bool exit_status_set_is_empty(ExitStatusSet *x) {
+        if (!x)
+                return true;
 
-        if (streq(v, "auto")) {
-                *ret = SHOW_STATUS_AUTO;
-                return 0;
-        }
-        r = parse_boolean(v);
-        if (r < 0)
-                return r;
-        *ret = r ? SHOW_STATUS_YES : SHOW_STATUS_NO;
-        return 0;
+        return set_isempty(x->status) && set_isempty(x->signal);
 }