From 0f4be56abd8fc87e1c68f652f56051c6779db4e1 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 4 Aug 2025 01:53:11 +0000
Subject:  First fixes

Signed-off-by: Laurent Bercot <ska@appnovation.com>
---
 src/libs6rc/s6rc_livedir_create.c   | 5 +++--
 src/libs6rc/s6rc_repo_set_compile.c | 4 +---
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/libs6rc')

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) ;
-- 
cgit v1.3.1