Implement badsub, refactor moveservices, get ready for enable/disable

8 files changed, 57 insertions, 43 deletions

diff --git a/src/libs6rc/deps-lib/s6rc b/src/libs6rc/deps-lib/s6rc
index e0bfe6e..79ccc20 100644
--- a/src/libs6rc/deps-lib/s6rc
+++ b/src/libs6rc/deps-lib/s6rc
@@ -14,6 +14,7 @@ s6rc_livedir_prefixsize.o
 s6rc_lock.o
 s6rc_nlto0.o
 s6rc_read_uint.o
+s6rc_repo_badsub.o
 s6rc_repo_cleanup.o
 s6rc_repo_compile.o
 s6rc_repo_fillset.o
@@ -25,11 +26,11 @@ s6rc_repo_listsub.o
 s6rc_repo_lock.o
 s6rc_repo_makedefbundle.o
 s6rc_repo_makesetbundles.o
-s6rc_repo_moveservices.o
 s6rc_repo_makesvlist.o
+s6rc_repo_moveservices.o
 s6rc_repo_refcompile.o
 s6rc_repo_setcompile.o
-s6rc_repo_sublist.o
+s6rc_repo_subnames.o
 s6rc_repo_sv_cmp.o
 s6rc_repo_sync.o
 s6rc_sanitize_dir.o
diff --git a/src/libs6rc/s6rc_repo_badsub.c b/src/libs6rc/s6rc_repo_badsub.c
index 8e52913..cba02b8 100644
--- a/src/libs6rc/s6rc_repo_badsub.c
+++ b/src/libs6rc/s6rc_repo_badsub.c
@@ -1,5 +1,6 @@
 /* ISC license. */
 
+#include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -12,11 +13,6 @@
 
 #include <s6-rc/repo.h>
 
-#define dienomem() strerr_diefu1sys(111, "stralloc_catb")
-
-typedef int qsortcmp_func (void const *, void const *) ;
-typedef qsortcmp_func *qsortcmp_func_ref ;
-
 static int s6rc_repo_sv_bcmpr (void const *a, void const *b, void *aux)
 {
   char const *key = a ;
@@ -32,14 +28,17 @@ static int strqcmp (void const *a, void const *b)
   return strcmp(*aa, *bb) ;
 }
 
-int s6rc_repo_listinconsistent (char const *repo, char const *set, char const **services, size_t n, uint8_t newsub, s6rc_repo_sv const *svlist, size_t nlist, stralloc *sa, genalloc *inconga)
+int s6rc_repo_badsub (char const *repo, char const *set, char const **services, size_t n, uint8_t newsub, s6rc_repo_sv const *svlist, size_t nlist, stralloc *sa, genalloc *badga)
 {
+  int sawasnull = !!sa->s ;
   size_t sabase = sa->len ;
+  int gawasnull = !!genalloc_s(uint32_t, badga) ;
+  size_t gabase = genalloc_len(uint32_t, badga) ;
   genalloc fulldeps = GENALLOC_ZERO ;
   size_t fulln ;
   size_t const *ind ;
 
-  if (s6rc_repo_listalldeps(repo, services, n, sa, &fulldeps, sub >= 2) <= 0) return 0 ;
+  if (s6rc_repo_listalldeps(repo, services, n, sa, &fulldeps, newsub >= 2) <= 0) return 0 ;
   qsort(services, n, sizeof(char const *), &strqcmp) ;
   fulln = genalloc_len(size_t, &fulldeps) ;
   ind = genalloc_s(size_t, &fulldeps) ;
@@ -48,11 +47,28 @@ int s6rc_repo_listinconsistent (char const *repo, char const *set, char const **
   {
     s6rc_repo_sv *p ;
     char const *cur = sa->s + ind[i] ;
-    uint8_t oldsub ;
     if (bsearch(&cur, services, n, sizeof(char const *), &strqcmp)) continue ;
     p = bsearchr(cur, svlist, nlist, sizeof(s6rc_repo_sv), &s6rc_repo_sv_bcmpr, sa) ;
     if (!p)
     {
+      strerr_warnfu6x("find service ", cur, " in set ", set, " of repository ", repo) ;
+      goto err ;
+    }
+    if (newsub >= 2 ? p->sub < newsub : p->sub > newsub)
+    {
+      uint32_t n = p - svlist ;
+      if (!genalloc_append(uint32_t, badga, &n))
+      {
+        strerr_warnfu1sys("make bad sub list") ;
+        goto err ;
+      }
     }
   }
+  genalloc_free(size_t, &fulldeps) ;
+  return 1 ;
+
+ err:
+  if (sawasnull) stralloc_free(sa) ; else sa->len = sabase ;
+  if (gawasnull) genalloc_free(uint32_t, badga) ; else genalloc_setlen(uint32_t, badga, gabase) ;
+  return 0 ;
 }
diff --git a/src/libs6rc/s6rc_repo_fillset.c b/src/libs6rc/s6rc_repo_fillset.c
index 5a82ddd..549de07 100644
--- a/src/libs6rc/s6rc_repo_fillset.c
+++ b/src/libs6rc/s6rc_repo_fillset.c
@@ -65,7 +65,7 @@ int s6rc_repo_fillset (char const *repo, char const *set, char const *const *exi
     }
     src[12 + len] = 0 ;
     memcpy(dst, setfn, repolen + 10 + setlen) ;
-    memcpy(dst + repolen + 10 + setlen, s6rc_repo_sublist[subi], 6) ;
+    memcpy(dst + repolen + 10 + setlen, s6rc_repo_subnames[subi], 6) ;
     dst[repolen + setlen + 16] = '/' ;
     memcpy(dst + repolen + setlen + 17, d->d_name, len+1) ;
     if (symlink(src, dst) == -1)
diff --git a/src/libs6rc/s6rc_repo_makesvlist.c b/src/libs6rc/s6rc_repo_makesvlist.c
index 4eeacf7..9cf0faa 100644
--- a/src/libs6rc/s6rc_repo_makesvlist.c
+++ b/src/libs6rc/s6rc_repo_makesvlist.c
@@ -51,7 +51,7 @@ int s6rc_repo_makesvlist (char const *repo, char const *set, stralloc *sa, genal
   subfn[repolen + 9 + setlen] = '/' ;
   for (uint8_t i = 0 ; i < 4 ; i++)
   {
-    memcpy(subfn + repolen + setlen + 10, s6rc_repo_sublist[i], 7) ;
+    memcpy(subfn + repolen + setlen + 10, s6rc_repo_subnames[i], 7) ;
     if (!s6rc_repo_addsub(subfn, i, sa, ga)) goto err ;
   }
   qsortr(genalloc_s(s6rc_repo_sv, ga), genalloc_len(s6rc_repo_sv, ga), sizeof(s6rc_repo_sv), &s6rc_repo_sv_cmp, sa) ;
diff --git a/src/libs6rc/s6rc_repo_moveservices.c b/src/libs6rc/s6rc_repo_moveservices.c
index 8177fe7..fb4bf9f 100644
--- a/src/libs6rc/s6rc_repo_moveservices.c
+++ b/src/libs6rc/s6rc_repo_moveservices.c
@@ -9,53 +9,50 @@
 
 #include <s6-rc/repo.h>
 
-int s6rc_repo_moveservices (char const *repo, char const *set, char const *const *services, size_t n, char const *fromsub, char const *tosub, unsigned int verbosity)
+int s6rc_repo_moveservices (char const *repo, char const *set, char const *const *services, size_t n, uint8_t oldsub, uint8_t newsub, unsigned int verbosity)
 {
   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++)
+  for (size_t i = 0 ; 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++)
+  char oldfn[repolen + setlen + maxserviceslen + 18] ;
+  char newfn[repolen + setlen + maxserviceslen + 18] ;
+  memcpy(oldfn, repo, repolen) ;
+  memcpy(oldfn + repolen, "/sources/", 9) ;
+  memcpy(oldfn + repolen + 9, set, setlen) ;
+  oldfn[repolen + 9 + setlen] = '/' ;
+  memcpy(oldfn + repolen + 10 + setlen, s6rc_repo_subnames[oldsub], 6) ;
+  oldfn[repolen + 16 + setlen] = '/' ;
+  memcpy(newfn, oldfn, repolen + 17 + setlen) ;
+  memcpy(newfn + repolen + 10 + setlen, s6rc_repo_subnames[newsub], 6) ;
+
+  for (size_t 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 (access(to, F_OK) == 0)
+    memcpy(oldfn + repolen + setlen + 17, services[i], len + 1) ;
+    memcpy(newfn + repolen + setlen + 17, services[i], len + 1) ;
+    if (access(newfn, F_OK) == 0)
     {
       if (verbosity >= 2)
-        strerr_warni8x("service ", services[i], " already existed in subset ", tosub, " of set ", set, " in repository ", repo) ;
+        strerr_warni8x("service ", services[i], " already existed in subset ", s6rc_repo_subnames[newsub], " of set ", set, " in repository ", repo) ;
     }
     else if (errno != ENOENT)
     {
-      strerr_warnfu2sys("access ", to) ;
+      strerr_warnfu2sys("access ", newfn) ;
       return 0 ;
     }
-    if (rename(from, to) == -1)
+    if (rename(oldfn, newfn) == -1)
     {
-      strerr_warnfu4sys("rename ", from, " to ", to) ;
+      strerr_warnfu4sys("rename ", oldfn, " to ", newfn) ;
       return 0 ;
     }
     if (verbosity >= 3)
     {
-      strerr_warnt10x("repository ", repo, ", set ", set, ", from subset ", fromsub, " to subset ", tosub, ": successfully moved service ", services[i]) ;
+      strerr_warnt10x("repository ", repo, ", set ", set, ", from subset ", s6rc_repo_subnames[oldsub], " to subset ", s6rc_repo_subnames[newsub], ": successfully moved service ", services[i]) ;
     }
   }
   return 1 ;
diff --git a/src/libs6rc/s6rc_repo_sublist.c b/src/libs6rc/s6rc_repo_sublist.c
deleted file mode 100644
index f252b6e..0000000
--- a/src/libs6rc/s6rc_repo_sublist.c
+++ /dev/null
@@ -1,5 +0,0 @@
-/* ISC license. */
-
-#include <s6-rc/repo.h>
-
-char const s6rc_repo_sublist[4][7] = { "masked", "active", "onboot", "always" } ;
diff --git a/src/libs6rc/s6rc_repo_subnames.c b/src/libs6rc/s6rc_repo_subnames.c
new file mode 100644
index 0000000..a60f4e8
--- /dev/null
+++ b/src/libs6rc/s6rc_repo_subnames.c
@@ -0,0 +1,5 @@
+/* ISC license. */
+
+#include <s6-rc/repo.h>
+
+char const s6rc_repo_subnames[4][7] = { "masked", "active", "onboot", "always" } ;
diff --git a/src/libs6rc/s6rc_repo_sync.c b/src/libs6rc/s6rc_repo_sync.c
index 46b14be..cc4db03 100644
--- a/src/libs6rc/s6rc_repo_sync.c
+++ b/src/libs6rc/s6rc_repo_sync.c
@@ -92,7 +92,7 @@ static int unlink_stales_in_sub (char const *repo, char const *set, char const *
 static inline int s6rc_repo_syncset (char const *repo, size_t repolen, char const *set, stralloc *sa, genalloc *ga, unsigned int verbosity)
 {
   for (unsigned int i = 0 ; i < 4 ; i++)
-    if (unlink_stales_in_sub(repo, set, s6rc_repo_sublist[i], i, sa, ga, verbosity)) goto err ;
+    if (unlink_stales_in_sub(repo, set, s6rc_repo_subnames[i], i, sa, ga, verbosity)) goto err ;
 
   {
     size_t n = genalloc_len(size_t, ga) ;