diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2017-03-12 11:59:43 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2017-03-12 11:59:43 +0000 |
| commit | c60ebd422171808ad58b936914055397bb205bef (patch) | |
| tree | 7db3e5728d72ad209f8e22b9eb9f337e0b0c3e58 /src/supervision/s6-svc.c | |
| parent | e28fe5908a91d8795ca9923d64eeed7d3e898434 (diff) | |
| download | s6-c60ebd422171808ad58b936914055397bb205bef.tar.xz | |
Adapt to skalibs-2.5.0.0
Diffstat (limited to 'src/supervision/s6-svc.c')
| -rw-r--r-- | src/supervision/s6-svc.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/supervision/s6-svc.c b/src/supervision/s6-svc.c index c929806..ed323af 100644 --- a/src/supervision/s6-svc.c +++ b/src/supervision/s6-svc.c @@ -1,10 +1,9 @@ /* ISC license. */ -#include <sys/types.h> +#include <string.h> #include <unistd.h> #include <errno.h> -#include <skalibs/uint.h> -#include <skalibs/bytestr.h> +#include <skalibs/types.h> #include <skalibs/sgetopt.h> #include <skalibs/strerr2.h> #include <skalibs/djbunix.h> @@ -27,7 +26,7 @@ int main (int argc, char const *const *argv, char const *const *envp) subgetopt_t l = SUBGETOPT_ZERO ; for (;;) { - register int opt = subgetopt_r(argc, argv, "abqhkti12pcoduxOXyT:w:", &l) ; + int opt = subgetopt_r(argc, argv, "abqhkti12pcoduxOXyT:w:", &l) ; if (opt == -1) break ; switch (opt) { @@ -57,7 +56,7 @@ int main (int argc, char const *const *argv, char const *const *envp) case 'T' : if (!uint0_scan(l.arg, &timeout)) dieusage() ; break ; case 'w' : { - if (byte_chr("dDuUrR", 6, l.arg[0]) >= 6) dieusage() ; + if (!memchr("dDuUrR", 6, l.arg[0])) dieusage() ; updown[1] = l.arg[0] ; break ; } @@ -72,10 +71,10 @@ int main (int argc, char const *const *argv, char const *const *envp) if (datalen <= 1) return 0 ; if (updown[1] == 'U' || updown[1] == 'R') { - size_t arglen = str_len(argv[0]) ; + size_t arglen = strlen(argv[0]) ; char fn[arglen + 17] ; - byte_copy(fn, arglen, argv[0]) ; - byte_copy(fn + arglen, 17, "/notification-fd") ; + memcpy(fn, argv[0], arglen) ; + memcpy(fn + arglen, "/notification-fd", 17) ; if (access(fn, F_OK) < 0) { if (errno != ENOENT) strerr_diefu2sys(111, "access ", fn) ; @@ -109,7 +108,7 @@ int main (int argc, char const *const *argv, char const *const *envp) } else { - register int r = s6_svc_writectl(argv[0], S6_SUPERVISE_CTLDIR, data + 1, datalen - 1) ; + int r = s6_svc_writectl(argv[0], S6_SUPERVISE_CTLDIR, data + 1, datalen - 1) ; if (r < 0) strerr_diefu2sys(111, "control ", argv[0]) ; else if (!r) strerr_diefu3x(100, "control ", argv[0], ": supervisor not listening") ; } |