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_supervise_lock_mode.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/libs6/s6_supervise_lock_mode.c') diff --git a/src/libs6/s6_supervise_lock_mode.c b/src/libs6/s6_supervise_lock_mode.c index cda4ac2..039760c 100644 --- a/src/libs6/s6_supervise_lock_mode.c +++ b/src/libs6/s6_supervise_lock_mode.c @@ -1,23 +1,22 @@ /* ISC license. */ -#include #include +#include #include -#include #include #include #include int s6_supervise_lock_mode (char const *subdir, unsigned int subdirmode, unsigned int controlmode) { - size_t subdirlen = str_len(subdir) ; + size_t subdirlen = strlen(subdir) ; int fdctl, fdctlw, fdlock ; char control[subdirlen + 9] ; char lock[subdirlen + 6] ; - byte_copy(control, subdirlen, subdir) ; - byte_copy(control + subdirlen, 9, "/control") ; - byte_copy(lock, subdirlen, subdir) ; - byte_copy(lock + subdirlen, 6, "/lock") ; + memcpy(control, subdir, subdirlen) ; + memcpy(control + subdirlen, "/control", 9) ; + memcpy(lock, subdir, subdirlen) ; + memcpy(lock + subdirlen, "/lock", 6) ; if ((mkdir(subdir, (mode_t)subdirmode) == -1) && (errno != EEXIST)) strerr_diefu2sys(111, "mkdir ", subdir) ; if (mkfifo(control, controlmode) < 0) -- cgit v1.3.1