From c60ebd422171808ad58b936914055397bb205bef Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Sun, 12 Mar 2017 11:59:43 +0000 Subject: Adapt to skalibs-2.5.0.0 --- src/libs6/s6_svc_ok.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/libs6/s6_svc_ok.c') diff --git a/src/libs6/s6_svc_ok.c b/src/libs6/s6_svc_ok.c index de30fd7..5e6aa27 100644 --- a/src/libs6/s6_svc_ok.c +++ b/src/libs6/s6_svc_ok.c @@ -1,20 +1,19 @@ /* ISC license. */ -#include +#include #include -#include #include #include int s6_svc_ok (char const *dir) { - size_t dirlen = str_len(dir) ; + size_t dirlen = strlen(dir) ; int fd ; char fn[dirlen + 9 + sizeof(S6_SUPERVISE_CTLDIR)] ; - byte_copy(fn, dirlen, dir) ; + memcpy(fn, dir, dirlen) ; 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") ; + memcpy(fn + dirlen + 1, S6_SUPERVISE_CTLDIR, sizeof(S6_SUPERVISE_CTLDIR) - 1) ; + memcpy(fn + dirlen + sizeof(S6_SUPERVISE_CTLDIR), "/control", 9) ; fd = open_write(fn) ; if (fd < 0) { -- cgit v1.3.1