Add makebundle, moveservices, defcompile

Signed-off-by: Laurent Bercot <ska@appnovation.com>

6 files changed, 174 insertions, 19 deletions

diff --git a/src/include/s6-rc/repo.h b/src/include/s6-rc/repo.h
index a260a91..958a135 100644
--- a/src/include/s6-rc/repo.h
+++ b/src/include/s6-rc/repo.h
@@ -14,10 +14,14 @@ extern int s6rc_repo_sync (char const *, char const *const *, size_t, unsigned i
 extern int s6rc_repo_lock (char const *, int) ;
 
 #define S6RC_REPO_SET_COMPILE_BUFLEN(repolen, setlen) ((repolen) + (setlen) + 45)
+extern int s6rc_repo_set_makebundle (char const *, char const *, char const *, char const *) ;
 extern int s6rc_repo_set_compile (char const *, char const *, char const *const *, size_t, char *, unsigned int, char const *) ;
+extern int s6rc_repo_set_defcompile (char const *, char const *, char const *, char *, unsigned int, char const *) ;
 
 extern int s6rc_repo_set_listdeps (char const *, char const *, stralloc *, genalloc *, int) ;
 extern int s6rc_repo_set_listalldeps (char const *, char const *const *, size_t, stralloc *, genalloc *, int) ;
 extern int s6rc_repo_set_listdeps_internal (char const *, char const *const *, size_t, stralloc *, genalloc *, uint32_t) ;
 
+extern int s6rc_repo_set_moveservices (char const *, char const *, char const *const *, size_t, char const *, char const *) ;
+
 #endif
diff --git a/src/libs6rc/deps-lib/s6rc b/src/libs6rc/deps-lib/s6rc
index 1d88c4c..81e7385 100644
--- a/src/libs6rc/deps-lib/s6rc
+++ b/src/libs6rc/deps-lib/s6rc
@@ -17,9 +17,12 @@ s6rc_read_uint.o
 s6rc_repo_cleanup.o
 s6rc_repo_lock.o
 s6rc_repo_set_compile.o
+s6rc_repo_set_defcompile.o
 s6rc_repo_set_listalldeps.o
 s6rc_repo_set_listdeps.o
 s6rc_repo_set_listdeps_internal.o
+s6rc_repo_set_makebundle.o
+s6rc_repo_set_moveservices.o
 s6rc_repo_sync.o
 s6rc_sanitize_dir.o
 s6rc_servicedir_internal.o
diff --git a/src/libs6rc/s6rc_repo_set_defcompile.c b/src/libs6rc/s6rc_repo_set_defcompile.c
new file mode 100644
index 0000000..ebd8a9d
--- /dev/null
+++ b/src/libs6rc/s6rc_repo_set_defcompile.c
@@ -0,0 +1,10 @@
+/* ISC license. */
+
+#include <s6-rc/repo.h>
+
+int s6rc_repo_set_defcompile (char const *repo, char const *set, char const *bundle, char *oldc, unsigned int verbosity, char const *fdhuser)
+{
+  static char const *const subs[3] = { "active", "onboot", "bundle" } ;
+  if (!s6rc_repo_set_makebundle(repo, set, "onboot", bundle)) return -1 ;
+  return s6rc_repo_set_compile(repo, set, subs, 3, oldc, verbosity, fdhuser) ;
+}
diff --git a/src/libs6rc/s6rc_repo_set_makebundle.c b/src/libs6rc/s6rc_repo_set_makebundle.c
new file mode 100644
index 0000000..fa52e40
--- /dev/null
+++ b/src/libs6rc/s6rc_repo_set_makebundle.c
@@ -0,0 +1,92 @@
+/* ISC license. */
+
+#include <skalibs/bsdsnowflake.h>
+#include <skalibs/nonposix.h>
+
+#include <string.h>
+#include <errno.h>
+
+#include <skalibs/stat.h>
+#include <skalibs/direntry.h>
+#include <skalibs/strerr.h>
+#include <skalibs/djbunix.h>
+
+#include <s6-rc/repo.h>
+
+int s6rc_repo_set_makebundle (char const *repo, char const *set, char const *sub, char const *bundle)
+{
+  size_t repolen = strlen(repo) ;
+  size_t setlen = strlen(set) ;
+  size_t sublen = strlen(sub) ;
+  size_t bundlelen = strlen(bundle) ;
+  size_t bfnlen = repolen + setlen + bundlelen + 28 ;
+  DIR *dir ;
+  char bfn[bfnlen + 1] ;
+  char subfn[repolen + setlen + sublen + 11] ;
+
+  memcpy(bfn, repo, repolen) ;
+  memcpy(bfn + repolen, "/sources/", 9) ;
+  memcpy(bfn + repolen + 9, set, setlen) ;
+  memcpy(bfn + repolen + 9 + setlen, "/bundle/", 8) ;
+  memcpy(bfn + repolen + 17 + setlen, bundle, bundlelen + 1) ;
+  if (rm_rf(bfn) == -1)
+  {
+    strerr_warnfu2sys("delete previous directory at ", bfn) ;
+    return 0 ;
+  }
+  if (mkdir(bfn, 02755) == -1)
+  {
+    strerr_warnfu2sys("mkdir ", bfn) ;
+    return 0 ;
+  }
+  memcpy(bfn + repolen + setlen + 17 + bundlelen, "/type", 6) ;
+  if (!openwritenclose_unsafe(bfn, "bundle\n", 7))
+  {
+    strerr_warnfu2sys("write to ", bfn) ;
+    return 0 ;
+  }
+  memcpy(bfn + repolen + setlen + 18 + bundlelen, "contents.d", 11) ;
+  if (mkdir(bfn, 02755) == -1)
+  {
+    strerr_warnfu2sys("mkdir ", bfn) ;
+    return 0 ;
+  }
+  bfn[bfnlen] = '/' ;
+
+  memcpy(subfn, bfn, repolen + 10 + setlen) ;
+  memcpy(subfn + repolen + 10 + setlen, sub, sublen + 1) ;
+  dir = opendir(subfn) ;
+  if (!dir)
+  {
+    strerr_warnfu2sys("opendir ", subfn) ;
+    return 0 ;
+  }
+
+  for (;;)
+  {
+    size_t len ;
+    direntry *d ;
+    errno = 0 ;
+    d = readdir(dir) ;
+    if (!d) break ;
+    if (d->d_name[0] == '.') continue ;
+    len = strlen(d->d_name) ;
+    char fn[bfnlen + len + 2] ;
+    memcpy(fn, bfn, bfnlen + 1) ;
+    memcpy(fn + bfnlen + 1, d->d_name, len + 1) ;
+    if (!openwritenclose_unsafe(fn, "", 0))
+    {
+      strerr_warnfu2sys("write to ", fn) ;
+      dir_close(dir) ;
+      return 0 ;
+    }
+  }
+  dir_close(dir) ;
+  if (errno)
+  {
+    strerr_warnfu2sys("readdir ", subfn) ;
+    return 0 ;
+  }
+
+  return 1 ;
+}
diff --git a/src/libs6rc/s6rc_repo_set_moveservices.c b/src/libs6rc/s6rc_repo_set_moveservices.c
new file mode 100644
index 0000000..bdaba4a
--- /dev/null
+++ b/src/libs6rc/s6rc_repo_set_moveservices.c
@@ -0,0 +1,57 @@
+/* ISC license. */
+
+#include <string.h>
+#include <errno.h>
+#include <stdio.h>
+
+#include <skalibs/strerr.h>
+
+#include <s6-rc/repo.h>
+
+int s6rc_repo_set_moveservices (char const *repo, char const *set, char const *const *services, size_t n, char const *fromsub, char const *tosub)
+{
+  size_t repolen = strlen(repo) ;
+  size_t setlen = strlen(set) ;
+  size_t fromsublen = strlen(fromsub) ;
+  size_t tosublen = strlen(tosub) ;
+  size_t maxserviceslen = 0 ;
+  size_t i = 0 ;
+  for (; i < n ; i++)
+  {
+    size_t len = strlen(services[i]) ;
+    if (len > maxserviceslen) maxserviceslen = len ;
+  }
+  char from[repolen + setlen + fromsublen + maxserviceslen + 12] ;
+  char to[repolen + setlen + tosublen + maxserviceslen + 12] ;
+  memcpy(from, repo, repolen) ;
+  memcpy(from + repolen, "/sources/", 9) ;
+  memcpy(from + repolen + 9, set, setlen) ;
+  from[repolen + 9 + setlen] = '/' ;
+  memcpy(to, from, repolen + 10 + setlen) ;
+  memcpy(from + repolen + 10 + setlen, fromsub, fromsublen) ;
+  from[repolen + 10 + setlen + fromsublen] = '/' ;
+  memcpy(to + repolen + 10 + setlen, tosub, tosublen) ;
+  to[repolen + 10 + setlen + tosublen] = '/' ;
+  for (i = 0 ; i < n ; i++)
+  {
+    size_t len = strlen(services[i]) ;
+    memcpy(from + repolen + setlen + fromsublen + 11, services[i], len + 1) ;
+    memcpy(to + repolen + setlen + tosublen + 11, services[i], len + 1) ;
+    if (rename(from, to) == -1) goto rollback ;
+  }
+  return 1 ;
+
+ rollback:
+  int e = errno ;
+  strerr_warnfu4sys("rename ", from, " to ", to) ;
+  while (i--)
+  {
+    size_t len = strlen(services[i]) ;
+    memcpy(from + repolen + setlen + fromsublen + 11, services[i], len + 1) ;
+    memcpy(to + repolen + setlen + tosublen + 11, services[i], len + 1) ;
+    if (rename(to, from) == -1)
+      strerr_warnwu4sys("rollback ", to, " to ", from) ;
+  }
+  errno = e ;
+  return 0 ;
+}
diff --git a/src/repo/s6-rc-set-new.c b/src/repo/s6-rc-set-new.c
index 26d134f..06b55d0 100644
--- a/src/repo/s6-rc-set-new.c
+++ b/src/repo/s6-rc-set-new.c
@@ -33,6 +33,7 @@ static void cleanup (char const *fn)
 
 static inline void newset (char const *repo, char const *setname)
 {
+  static char const sublist[4][7] = { "masked", "onboot", "bundle", "active" } ;
   size_t repolen = strlen(repo) ;
   size_t setlen = strlen(setname) ;
   char everything[repolen + 21] ;
@@ -63,26 +64,14 @@ static inline void newset (char const *repo, char const *setname)
     strerr_diefu2sys(111, "create ", act) ;
   }
 
-  memcpy(act + repolen + 18 + setlen, "masked", 7) ;
-  if (mkdir(act, 02755) == -1)
+  for (size_t i = 0 ; i < 4 ; i++)
   {
-    cleanup(tmp) ;
-    strerr_diefu2sys(111, "mkdir ", act) ;
-  }
-
-  memcpy(act + repolen + 18 + setlen, "onboot", 7) ;
-  if (mkdir(act, 02755) == -1)
-  {
-    cleanup(tmp) ;
-    strerr_diefu2sys(111, "mkdir ", act) ;
-  }
-  memcpy(onb, act, repolen + 25 + setlen) ;
-
-  memcpy(act + repolen + 18 + setlen, "active", 7) ;
-  if (mkdir(act, 02755) == -1)
-  {
-    cleanup(tmp) ;
-    strerr_diefu2sys(111, "mkdir ", act) ;
+    memcpy(act + repolen + 18 + setlen, sublist[i], 7) ;
+    if (mkdir(act, 02755) == -1)
+    {
+      cleanup(tmp) ;
+      strerr_diefu2sys(111, "mkdir ", act) ;
+    }
   }
 
   DIR *dir = opendir(everything) ;