summaryrefslogtreecommitdiff
path: root/src/supervision
diff options
context:
space:
mode:
Diffstat (limited to 'src/supervision')
-rw-r--r--src/supervision/deps-exe/s6-svok1
-rw-r--r--src/supervision/s6-svok.c24
2 files changed, 5 insertions, 20 deletions
diff --git a/src/supervision/deps-exe/s6-svok b/src/supervision/deps-exe/s6-svok
index e7187fe..08815d9 100644
--- a/src/supervision/deps-exe/s6-svok
+++ b/src/supervision/deps-exe/s6-svok
@@ -1 +1,2 @@
+${LIBS6}
-lskarnet
diff --git a/src/supervision/s6-svok.c b/src/supervision/s6-svok.c
index 4a615e9..176d8a8 100644
--- a/src/supervision/s6-svok.c
+++ b/src/supervision/s6-svok.c
@@ -1,32 +1,16 @@
/* ISC license. */
-#include <errno.h>
-#include <skalibs/bytestr.h>
#include <skalibs/strerr2.h>
-#include <skalibs/djbunix.h>
#include <s6/s6-supervise.h>
#define USAGE "s6-svok servicedir"
int main (int argc, char const *const *argv)
{
+ int r ;
PROG = "s6-svok" ;
if (argc < 2) strerr_dieusage(100, USAGE) ;
- argv++ ; argc-- ;
- {
- int fd ;
- unsigned int dirlen = str_len(*argv) ;
- char fn[dirlen + 9 + sizeof(S6_SUPERVISE_CTLDIR)] ;
- byte_copy(fn, dirlen, *argv) ;
- fn[dirlen] = '/' ;
- byte_copy(fn + dirlen + 1, sizeof(S6_SUPERVISE_CTLDIR) - 1, S6_SUPERVISE_CTLDIR) ;
- byte_copy(fn + dirlen + sizeof(S6_SUPERVISE_CTLDIR), 9, "/control") ;
- fd = open_write(fn) ;
- if (fd < 0)
- {
- if ((errno == ENXIO) || (errno == ENOENT)) return 1 ;
- else strerr_diefu2sys(111, "open_write ", fn) ;
- }
- }
- return 0 ;
+ r = s6_svc_ok(argv[1]) ;
+ if (r < 0) strerr_diefu2sys(111, "check ", argv[1]) ;
+ return !r ;
}