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/libs6/s6_svc_writectl.c | |
| parent | e28fe5908a91d8795ca9923d64eeed7d3e898434 (diff) | |
| download | s6-c60ebd422171808ad58b936914055397bb205bef.tar.xz | |
Adapt to skalibs-2.5.0.0
Diffstat (limited to 'src/libs6/s6_svc_writectl.c')
| -rw-r--r-- | src/libs6/s6_svc_writectl.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/libs6/s6_svc_writectl.c b/src/libs6/s6_svc_writectl.c index 26c0fb6..b4d8e15 100644 --- a/src/libs6/s6_svc_writectl.c +++ b/src/libs6/s6_svc_writectl.c @@ -1,17 +1,16 @@ /* ISC license. */ -#include <sys/types.h> -#include <skalibs/bytestr.h> +#include <string.h> #include <s6/s6-supervise.h> int s6_svc_writectl (char const *service, char const *subdir, char const *s, size_t len) { - size_t svlen = str_len(service) ; - size_t sublen = str_len(subdir) ; + size_t svlen = strlen(service) ; + size_t sublen = strlen(subdir) ; char fn[svlen + sublen + 10] ; - byte_copy(fn, svlen, service) ; + memcpy(fn, service, svlen) ; fn[svlen] = '/' ; - byte_copy(fn + svlen + 1, sublen, subdir) ; - byte_copy(fn + svlen + 1 + sublen, 9, "/control") ; + memcpy(fn + svlen + 1, subdir, sublen) ; + memcpy(fn + svlen + 1 + sublen, "/control", 9) ; return s6_svc_write(fn, s, len) ; } |