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_supervise_lock_mode.c | |
| parent | e28fe5908a91d8795ca9923d64eeed7d3e898434 (diff) | |
| download | s6-c60ebd422171808ad58b936914055397bb205bef.tar.gz | |
Adapt to skalibs-2.5.0.0
Diffstat (limited to 'src/libs6/s6_supervise_lock_mode.c')
| -rw-r--r-- | src/libs6/s6_supervise_lock_mode.c | 13 |
1 files changed, 6 insertions, 7 deletions
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 <sys/types.h> #include <sys/stat.h> +#include <string.h> #include <errno.h> -#include <skalibs/bytestr.h> #include <skalibs/strerr2.h> #include <skalibs/djbunix.h> #include <s6/s6-supervise.h> 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) |