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 +---
 src/repo/s6-rc-repo-init.c          | 3 ++-
 src/repo/s6-rc-set-copy.c           | 3 ++-
 src/repo/s6-rc-set-delete.c         | 2 ++
 src/repo/s6-rc-set-new.c            | 2 ++
 6 files changed, 12 insertions(+), 7 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) ;
diff --git a/src/repo/s6-rc-repo-init.c b/src/repo/s6-rc-repo-init.c
index 7cc1c70..06ba632 100644
--- a/src/repo/s6-rc-repo-init.c
+++ b/src/repo/s6-rc-repo-init.c
@@ -12,6 +12,7 @@
 #include <skalibs/stat.h>
 #include <skalibs/posixplz.h>
 #include <skalibs/gol.h>
+#include <skalibs/tai.h>
 #include <skalibs/prog.h>
 #include <skalibs/strerr.h>
 #include <skalibs/djbunix.h>
@@ -76,7 +77,7 @@ int main (int argc, char const *const *argv)
     if (argv[i][0] != '/')
       strerr_dief2x(100, argv[i], " is not an absolute path") ;
   if (!argc) strerr_warnw1x("no source directories given, creating an empty repository") ;
-
+  tain_now_g() ;
   repolen = strlen(repo) ;
   char repotmp[repolen + 12] ;
   char tmp[repolen + 21] ;
diff --git a/src/repo/s6-rc-set-copy.c b/src/repo/s6-rc-set-copy.c
index a76a32c..202ac9e 100644
--- a/src/repo/s6-rc-set-copy.c
+++ b/src/repo/s6-rc-set-copy.c
@@ -9,6 +9,7 @@
 #include <skalibs/prog.h>
 #include <skalibs/strerr.h>
 #include <skalibs/gol.h>
+#include <skalibs/tai.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/unix-transactional.h>
 
@@ -125,7 +126,7 @@ int main (int argc, char const *const *argv)
 
   fdlock = s6rc_repo_lock(repo, 1) ;
   if (fdlock == -1) strerr_diefu2sys(111, "lock ", repo) ;
-
+  tain_now_g() ;
   docopy(repo, argv[0], argv[1]) ;
   return 0 ;
 }
diff --git a/src/repo/s6-rc-set-delete.c b/src/repo/s6-rc-set-delete.c
index 58fe4f0..8885e0c 100644
--- a/src/repo/s6-rc-set-delete.c
+++ b/src/repo/s6-rc-set-delete.c
@@ -8,6 +8,7 @@
 #include <skalibs/prog.h>
 #include <skalibs/strerr.h>
 #include <skalibs/gol.h>
+#include <skalibs/tai.h>
 #include <skalibs/djbunix.h>
 
 #include <s6-rc/config.h>
@@ -78,6 +79,7 @@ int main (int argc, char const *const *argv)
 
   fdlock = s6rc_repo_lock(repo, 1) ;
   if (fdlock == -1) strerr_diefu2sys(111, "lock ", repo) ;
+  tain_now_g() ;
 
   for (unsigned int i = 0 ; i < argc ; i++)
     dodelete(repo, argv[i]) ;
diff --git a/src/repo/s6-rc-set-new.c b/src/repo/s6-rc-set-new.c
index 1a56b9d..26d134f 100644
--- a/src/repo/s6-rc-set-new.c
+++ b/src/repo/s6-rc-set-new.c
@@ -12,6 +12,7 @@
 #include <skalibs/stat.h>
 #include <skalibs/posixplz.h>
 #include <skalibs/gol.h>
+#include <skalibs/tai.h>
 #include <skalibs/prog.h>
 #include <skalibs/strerr.h>
 #include <skalibs/direntry.h>
@@ -179,6 +180,7 @@ int main (int argc, char const *const *argv)
 
   fdlock = s6rc_repo_lock(repo, 1) ;
   if (fdlock == -1) strerr_diefu2sys(111, "lock ", repo) ;
+  tain_now_g() ;
 
   for (unsigned int i = 0 ; i < argc ; i++)
     newset(repo, argv[i]) ;
-- 
cgit v1.3.1