aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs6rc
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs6rc')
-rw-r--r--src/libs6rc/s6rc_livedir_create.c5
-rw-r--r--src/libs6rc/s6rc_repo_set_compile.c4
2 files changed, 4 insertions, 5 deletions
diff --git a/src/libs6rc/s6rc_livedir_create.c b/src/libs6rc/s6rc_livedir_create.c
index e4056b1..0fa4696 100644
--- a/src/libs6rc/s6rc_livedir_create.c
+++ b/src/libs6rc/s6rc_livedir_create.c
@@ -1,13 +1,14 @@
/* ISC license. */
-#include <skalibs/nonposix.h>
+#include <skalibs/bsdsnowflake.h> /* stat.h */
+#include <skalibs/nonposix.h> /* mkdtemp */
-#include <sys/stat.h>
#include <errno.h>
#include <string.h>
#include <unistd.h>
#include <stdlib.h>
+#include <skalibs/stat.h>
#include <skalibs/stralloc.h>
#include <skalibs/djbunix.h>
diff --git a/src/libs6rc/s6rc_repo_set_compile.c b/src/libs6rc/s6rc_repo_set_compile.c
index 477549a..1ca5e56 100644
--- a/src/libs6rc/s6rc_repo_set_compile.c
+++ b/src/libs6rc/s6rc_repo_set_compile.c
@@ -1,7 +1,5 @@
/* ISC license. */
-#include <skalibs/bsdsnowflake.h>
-
#include <string.h>
#include <unistd.h>
#include <stdlib.h>
@@ -21,7 +19,7 @@
int s6rc_repo_set_compile (char const *repo, char const *set, char const *const *subs, size_t nsubs, char *oldc, unsigned int verbosity, char const *fdhuser)
{
size_t repolen = strlen(repo) ;
- size_t setlen = strlen(repo) ;
+ size_t setlen = strlen(set) ;
size_t totsublen = 0 ;
char newc[S6RC_REPO_SET_COMPILE_BUFLEN(repolen, setlen)] ;
memcpy(newc, repo, repolen) ;