diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2022-08-18 22:59:52 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2022-08-18 22:59:52 +0000 |
| commit | fe736e4ea581a5a05456deb50a86890b1ecfe4d1 (patch) | |
| tree | dc800811dd8450c3ca9485a204b042f01c6d7139 /src/libs6rc/s6rc_servicedir_copy_online.c | |
| parent | 21c5855ef363672f10e3f0d06a83b3a68e567b88 (diff) | |
| download | s6-rc-fe736e4ea581a5a05456deb50a86890b1ecfe4d1.tar.gz | |
Change s6rc_servicedir to types defined in s6/servicedir.h
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'src/libs6rc/s6rc_servicedir_copy_online.c')
| -rw-r--r-- | src/libs6rc/s6rc_servicedir_copy_online.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/libs6rc/s6rc_servicedir_copy_online.c b/src/libs6rc/s6rc_servicedir_copy_online.c index 5e84079..62d7c87 100644 --- a/src/libs6rc/s6rc_servicedir_copy_online.c +++ b/src/libs6rc/s6rc_servicedir_copy_online.c @@ -7,6 +7,7 @@ #include <stdio.h> #include <skalibs/djbunix.h> +#include <s6/servicedir.h> #include <s6-rc/s6rc-utils.h> #include "s6rc-servicedir-internal.h" @@ -20,9 +21,9 @@ int s6rc_servicedir_copy_online (char const *src, char const *dst) unsigned int i = 0 ; int wantup = 0 ; int e ; - char srcfn[srclen + s6rc_servicedir_file_maxlen + 6] ; - char dstfn[dstlen + s6rc_servicedir_file_maxlen + 6] ; - char oldfn[dstlen + s6rc_servicedir_file_maxlen + 6] ; + char srcfn[srclen + S6_SERVICEDIR_FILE_MAXLEN + 6] ; + char dstfn[dstlen + S6_SERVICEDIR_FILE_MAXLEN + 6] ; + char oldfn[dstlen + S6_SERVICEDIR_FILE_MAXLEN + 6] ; memcpy(srcfn, src, srclen) ; srcfn[srclen] = '/' ; memcpy(dstfn, dst, dstlen + 1) ; @@ -45,7 +46,7 @@ int s6rc_servicedir_copy_online (char const *src, char const *dst) strcpy(dstfn + dstlen + 1, s6rc_servicedir_file_list[i].name) ; strcpy(oldfn + dstlen + 5, s6rc_servicedir_file_list[i].name) ; if (rename(dstfn, oldfn) < 0 - && (errno != ENOENT || s6rc_servicedir_file_list[i].options & SVFILE_MANDATORY)) + && (errno != ENOENT || s6rc_servicedir_file_list[i].options & S6_SVFILE_MANDATORY)) { e = errno ; goto errrename ; |