X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fexit-status.c;h=c09efdd2cb79c1643aed2c8042e3f90f361d8f07;hb=b733fbe7a0214eb43e402db7179697bf9c0975c1;hp=b036ded1f48073f0fd8d397f7941d652bbd6e0cc;hpb=060e088e94852cbe166592429c330e3997c21c4c;p=elogind.git

diff --git a/src/shared/exit-status.c b/src/shared/exit-status.c
index b036ded1f..c09efdd2c 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"
@@ -150,7 +149,7 @@ const char* exit_status_to_string(ExitStatus status, ExitStatusLevel level) {
                         return "MAKE_STARTER";
 
                 case EXIT_BUS_ENDPOINT:
-                        return "EXIT_BUS_ENDPOINT";
+                        return "BUS_ENDPOINT";
                 }
         }
 
@@ -167,7 +166,7 @@ const char* exit_status_to_string(ExitStatus status, ExitStatusLevel level) {
                         return "NOPERMISSION";
 
                 case EXIT_NOTINSTALLED:
-                        return "NOTINSSTALLED";
+                        return "NOTINSTALLED";
 
                 case EXIT_NOTCONFIGURED:
                         return "NOTCONFIGURED";
@@ -226,3 +225,17 @@ bool exit_status_set_is_empty(ExitStatusSet *x) {
 
         return set_isempty(x->status) && set_isempty(x->signal);
 }
+
+bool exit_status_set_test(ExitStatusSet *x, int code, int status) {
+
+        if (exit_status_set_is_empty(x))
+                return false;
+
+        if (code == CLD_EXITED && set_contains(x->status, INT_TO_PTR(status)))
+                return true;
+
+        if (IN_SET(code, CLD_KILLED, CLD_DUMPED) && set_contains(x->signal, INT_TO_PTR(status)))
+                return true;
+
+        return false;
+}