More progress: updated sync, nominal fix

10 files changed, 268 insertions, 143 deletions

diff --git a/src/libs6rc/deps-lib/s6rc b/src/libs6rc/deps-lib/s6rc
index a4bb8bd..87feaee 100644
--- a/src/libs6rc/deps-lib/s6rc
+++ b/src/libs6rc/deps-lib/s6rc
@@ -12,6 +12,7 @@ s6rc_livedir_create.o
 s6rc_livedir_prefix.o
 s6rc_livedir_prefixsize.o
 s6rc_lock.o
+s6rc_ls.o
 s6rc_nlto0.o
 s6rc_read_uint.o
 s6rc_repo_badsub.o
@@ -20,6 +21,7 @@ s6rc_repo_compile.o
 s6rc_repo_fillset.o
 s6rc_repo_fixset.o
 s6rc_repo_flattenservices.o
+s6rc_repo_list_sets.o
 s6rc_repo_listalldeps.o
 s6rc_repo_listcontents.o
 s6rc_repo_listdeps.o
@@ -37,6 +39,8 @@ s6rc_repo_subnames.o
 s6rc_repo_sv_bcmpr.o
 s6rc_repo_sv_cmpr.o
 s6rc_repo_sync.o
+s6rc_repo_syncset.o
+s6rc_repo_syncset_tmp.o
 s6rc_sanitize_dir.o
 s6rc_servicedir_internal.o
 s6rc_servicedir_block.o
diff --git a/src/libs6rc/s6rc_ls.c b/src/libs6rc/s6rc_ls.c
new file mode 100644
index 0000000..75f90f2
--- /dev/null
+++ b/src/libs6rc/s6rc_ls.c
@@ -0,0 +1,46 @@
+/* ISC license. */
+
+#include <string.h>
+#include <errno.h>
+
+#include <skalibs/direntry.h>
+#include <skalibs/stralloc.h>
+#include <skalibs/genalloc.h>
+
+#include <s6-rc/s6rc-utils.h>
+
+int s6rc_ls (char const *fn, stralloc *sa, genalloc *ga)
+{
+  size_t sabase = sa->len ;
+  size_t gabase = genalloc_len(size_t, ga) ;
+  int sawasnull = !sa->s ;
+  int gawasnull = !genalloc_s(size_t, ga) ;
+  int n = 0 ;
+
+  DIR *dir = opendir(fn) ;
+  if (!dir) return -1 ;
+  for (;;)
+  {
+    direntry *d ;
+    size_t len ;
+    errno = 0 ;
+    d = readdir(dir) ;
+    if (!d) break ;
+    if (d->d_name[0] == '.') continue ;
+    len = strlen(d->d_name) ;
+    if (!genalloc_catb(size_t, ga, &sa->len, 1)) goto err ;
+    if (!stralloc_catb(sa, d->d_name, len+1)) goto err ;
+    n++ ;
+  }
+  if (errno) goto err ;
+  dir_close(dir) ;
+  return n ;
+
+ err:
+  dir_close(dir) ;
+  if (gawasnull) genalloc_free(size_t, ga) ;
+  else genalloc_setlen(size_t, ga, gabase) ;
+  if (sawasnull) stralloc_free(sa) ;
+  else sa->len = sabase ;
+  return -1 ;
+}
diff --git a/src/libs6rc/s6rc_repo_fix.c b/src/libs6rc/s6rc_repo_fix.c
new file mode 100644
index 0000000..b379d30
--- /dev/null
+++ b/src/libs6rc/s6rc_repo_fix.c
@@ -0,0 +1,51 @@
+/* ISC license. */
+
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+
+#include <skalibs/posixplz.h>
+#include <skalibs/direntry.h>
+#include <skalibs/strerr.h>
+#include <skalibs/stralloc.h>
+#include <skalibs/genalloc.h>
+
+#include <s6-rc/repo.h>
+
+int s6rc_repo_fix (char const *repo, uint32_t options, unsigned int verbosity)
+{
+  stralloc sa = STRALLOC_ZERO ;
+  genalloc svlist = GENALLOC_ZERO ;  /* s6rc_repo_sv */
+  genalloc badga = GENALLOC_ZERO ;  /* uint32_t */
+  genalloc setind = GENALLOC_ZERO ;  /* size_t */
+  int n ;
+
+  if (verbosity >= 3)
+    strerr_warni2x("checking set consistency in repository ", repo) ;
+
+  n = s6rc_repo_list_sets(repo, &sa, &setind) ;
+  if (n < 0)
+  {
+    strerr_warnfu1sys("list sets") ;
+    return 0 ;
+  }
+  for (uint32_t i = 0 ; i < nsets ; i++)
+  {
+    if (verbosity >= 3)
+      strerr_warni2x("checking set ", sa.s + genalloc_s(size_t, &setind)[i]) ;
+    if (!s6rc_repo_fixset(repo, sa.s + genalloc_s(size_t, &setind)[i], options, verbosity, &sa, &svlist, &badga)) goto err ;
+  }
+
+  genalloc_free(s6rc_repo_sv, &svlist) ;
+  genalloc_free(uint32_t, &badga) ;
+  genalloc_free(size_t, &setind) ;
+  stralloc_free(&sa) ;
+  return 1 ;
+
+ err:
+  genalloc_free(s6rc_repo_sv, &svlist) ;
+  genalloc_free(uint32_t, &badga) ;
+  genalloc_free(size_t, &setind) ;
+  stralloc_free(&sa) ;
+  return 0 ;
+}
diff --git a/src/libs6rc/s6rc_repo_fixset.c b/src/libs6rc/s6rc_repo_fixset.c
index efc6320..8ad64bc 100644
--- a/src/libs6rc/s6rc_repo_fixset.c
+++ b/src/libs6rc/s6rc_repo_fixset.c
@@ -5,7 +5,6 @@
 #include <errno.h>
 
 #include <skalibs/posixplz.h>
-#include <skalibs/direntry.h>
 #include <skalibs/strerr.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/genalloc.h>
diff --git a/src/libs6rc/s6rc_repo_list_sets.c b/src/libs6rc/s6rc_repo_list_sets.c
new file mode 100644
index 0000000..99f2162
--- /dev/null
+++ b/src/libs6rc/s6rc_repo_list_sets.c
@@ -0,0 +1,15 @@
+/* ISC license. */
+
+#include <string.h>
+
+#include <s6-rc/s6rc-utils.h>
+#include <s6-rc/repo.h>
+
+int s6rc_repo_list_sets (char const *repo, stralloc *sa, genalloc *ga)
+{
+  size_t repolen = strlen(repo) ;
+  char fn[repolen + 9] ;
+  memcpy(fn, repo, repolen) ;
+  memcpy(fn + repolen, "/sources", 9) ;
+  return s6rc_ls(fn, sa, ga) ;
+}
diff --git a/src/libs6rc/s6rc_repo_listsub.c b/src/libs6rc/s6rc_repo_listsub.c
index eef0a7c..eed5cb4 100644
--- a/src/libs6rc/s6rc_repo_listsub.c
+++ b/src/libs6rc/s6rc_repo_listsub.c
@@ -1,59 +1,20 @@
 /* ISC license. */
 
 #include <string.h>
-#include <errno.h>
-
-#include <skalibs/direntry.h>
-#include <skalibs/strerr.h>
-#include <skalibs/stralloc.h>
-#include <skalibs/genalloc.h>
 
+#include <s6-rc/s6rc-utils.h>
 #include <s6-rc/repo.h>
 
 int s6rc_repo_listsub (char const *repo, char const *set, char const *sub, stralloc *sa, genalloc *ga)
 {
-  size_t sabase = sa->len ;
-  size_t gabase = genalloc_len(size_t, ga) ;
   size_t repolen = strlen(repo) ;
   size_t setlen = strlen(set) ;
   size_t sublen = strlen(sub) ;
-  int sawasnull = !sa->s ;
-  int gawasnull = !genalloc_s(size_t, ga) ;
-  int n = 0 ;
   char fn[repolen + setlen + 10 + sublen] ;
   memcpy(fn, repo, repolen) ;
   memcpy(fn + repolen, "/sources/", 9) ;
   memcpy(fn + repolen + 9, set, setlen) ;
-  memcpy(fn + repolen + 9 + setlen, sub, sublen) ;
-
-  DIR *dir = opendir(fn) ;
-  if (!dir)
-  {
-    strerr_warnfu2sys("opendir ", fn) ;
-    return -1 ;
-  }
-  for (;;)
-  {
-    direntry *d ;
-    size_t len ;
-    errno = 0 ;
-    d = readdir(dir) ;
-    if (!d) break ;
-    if (d->d_name[0] == '.') continue ;
-    len = strlen(d->d_name) ;
-    if (!genalloc_catb(size_t, ga, &sa->len, 1)) goto err ;
-    if (!stralloc_catb(sa, d->d_name, len+1)) goto err ;
-    n++ ;
-  }
-  if (errno) goto err ;
-  dir_close(dir) ;
-  return n ;
+  memcpy(fn + repolen + 9 + setlen, sub, sublen + 1) ;
 
- err:
-  dir_close(dir) ;
-  if (gawasnull) genalloc_free(size_t, ga) ;
-  else genalloc_setlen(size_t, ga, gabase) ;
-  if (sawasnull) stralloc_free(sa) ;
-  else sa->len = sabase ;
-  return -1 ;
+  return s6rc_ls(fn, sa, ga) ;
 }
diff --git a/src/libs6rc/s6rc_repo_makesetbundles.c b/src/libs6rc/s6rc_repo_makesetbundles.c
index 8fcf979..12d76b8 100644
--- a/src/libs6rc/s6rc_repo_makesetbundles.c
+++ b/src/libs6rc/s6rc_repo_makesetbundles.c
@@ -34,8 +34,12 @@ int s6rc_repo_makesetbundles (char const *repo, char const *set, unsigned int ve
   memcpy(src + repolen + 10, ".bundles", 9) ;
   rm_rf_tmp(dst, &sa) ;
 
-  n = s6rc_repo_listsub(repo, set, "masked", &sa, &ga) ;
-  if (n < 0) goto err ;
+  n = s6rc_repo_listsub(repo, set, s6rc_repo_subnames[0], &sa, &ga) ;
+  if (n < 0)
+  {
+    strerr_warnfu6sys("list sub ",  s6rc_repo_subnames[0], " of set ", set, " in repository ", repo) ;
+    goto err ;
+  }
   if (n)
   {
     DIR *dir ;
diff --git a/src/libs6rc/s6rc_repo_sync.c b/src/libs6rc/s6rc_repo_sync.c
index cc4db03..8e5956b 100644
--- a/src/libs6rc/s6rc_repo_sync.c
+++ b/src/libs6rc/s6rc_repo_sync.c
@@ -8,6 +8,7 @@
 #include <stdlib.h>
 #include <errno.h>
 
+#include <skalibs/uint32.h>
 #include <skalibs/direntry.h>
 #include <skalibs/posixplz.h>
 #include <skalibs/strerr.h>
@@ -27,98 +28,19 @@ static inline void cleanup (char const *ato, char const *bun)
   errno = e ;
 }
 
-static int unlink_stales_in_sub (char const *repo, char const *set, char const *sub, uint32_t where, stralloc *sa, genalloc *ga, unsigned int verbosity)
-{
-  size_t repolen = strlen(repo) ;
-  size_t setlen = strlen(set) ;
-  size_t sublen = strlen(sub) ;
-  size_t subfnlen = repolen + setlen + sublen + 10 ;
-  char subfn[subfnlen + 1] ;
-  memcpy(subfn, repo, repolen) ;
-  memcpy(subfn + repolen, "/sources/", 9) ;
-  memcpy(subfn + repolen + 9, set, setlen) ;
-  subfn[repolen + 9 + setlen] = '/' ;
-  memcpy(subfn + repolen + 10 + setlen, sub, sublen + 1) ;
-  DIR *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[subfnlen + len + 2] ;
-    memcpy(fn, subfn, sublen) ;
-    fn[sublen] = '/' ;
-    memcpy(fn + sublen + 1, d->d_name, len+1) ;
-    if (access(fn, F_OK) == -1)
-    {
-      if (errno != ENOENT)
-      {
-        strerr_warnfu2sys("access ", fn) ;
-        goto err ;
-      }
-      unlink_void(fn) ;
-      if (verbosity >= 2)
-        strerr_warni6x("service ", d->d_name, " does not exist anymore, removed from sub ", sub, " of set ", set) ;
-    }
-    else
-    {
-      if (!genalloc_append(size_t, ga, &sa->len)) goto err ;
-      if (!stralloc_catb(sa, d->d_name, len+1)) goto err ;
-    }
-  }
-  if (errno)
-  {
-    strerr_warnfu2sys("readdir ", subfn) ;
-    goto err ;
-  }
-
-  dir_close(dir) ;
-  return 1 ;
-
- err:
-  dir_close(dir) ;
-  return 0 ;
-}
-
-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_subnames[i], i, sa, ga, verbosity)) goto err ;
-
-  {
-    size_t n = genalloc_len(size_t, ga) ;
-    char const *stillhere[n + !n] ;
-    for (size_t i = 0 ; i < n ; i++) stillhere[i] = sa->s + genalloc_s(size_t, ga)[i] ;
-    if (!s6rc_repo_fillset(repo, set, stillhere, n)) goto err ;
-  }
-
-  sa->len = 0 ;
-  genalloc_setlen(size_t, ga, 0) ;
-  return 1 ;
-
- err:
-  sa->len = 0 ;
-  genalloc_setlen(size_t, ga, 0) ;
-  return 0 ;
-}
-
-int s6rc_repo_sync (char const *repo, char const *const *sources, size_t sourceslen, unsigned int verbosity, char const *fdhuser)
+int s6rc_repo_sync (char const *repo, unsigned int verbosity, char const *fdhuser)
 {
   size_t repolen = strlen(repo) ;
+  char store[repolen + 17] ;
   char ato[repolen + 26] ;
   char bun[repolen + 26] ;
 
+  memcpy(store, repo, repolen) ;
+  memcpy(store + repolen, "/stores/", 8) ;
+  store[repolen + 16] = 0 ;
+
 
- /* Fill new .atomics/ and .bundles/ with symlinks to real sources */
+ /* Fill new .atomics/ and .bundles/ with symlinks to real stores */
 
   memcpy(ato, repo, repolen) ;
   memcpy(ato + repolen, "/sources/..atomics:XXXXXX", 26) ;
@@ -147,13 +69,15 @@ int s6rc_repo_sync (char const *repo, char const *const *sources, size_t sources
     return 0 ;
   }
 
-  for (size_t i = 0 ; i < sourceslen ; i++)
+  for (uint32_t istore = 0 ;; istore++)
   {
-    size_t srclen = strlen(sources[i]) ;
-    DIR *dir = opendir(sources[i]) ;
+    DIR *dir ;
+    uint320_xfmt(store + repolen + 8, istore, 8) ;
+    dir = opendir(store) ;
     if (!dir)
     {
-      strerr_warnfu2sys("opendir ", sources[i]) ;
+      if (errno == ENOENT) break ;
+      strerr_warnfu2sys("opendir ", store) ;
       goto err ;
     }
     for (;;)
@@ -168,10 +92,11 @@ int s6rc_repo_sync (char const *repo, char const *const *sources, size_t sources
       {
         char const *x ;
         char dst[repolen + 28 + len] ;
-        char src[srclen + len + 2] ;
-        memcpy(src, sources[i], srclen) ;
-        src[srclen] = '/' ;
-        memcpy(src + srclen + 1, d->d_name, len+1) ;
+        char src[26 + len] ;
+        memcpy(src, "../../../stores/", 16) ;
+        memcpy(src + 16, store + repolen + 8, 8) ;
+        src[24] = '/' ;
+        memcpy(src + 25, d->d_name, len+1) ;
         switch (s6rc_type_check(-1, src))
         {
           case 1 :
@@ -215,13 +140,13 @@ int s6rc_repo_sync (char const *repo, char const *const *sources, size_t sources
     dir_close(dir) ;
     if (errno)
     {
-      strerr_warnfu2sys("readdir ", sources[i]) ;
+      strerr_warnfu2sys("readdir ", store) ;
       goto err ;
     }
   }
 
 
- /* Compile the reference db - also checks new sources consistency */
+ /* Compile the reference db - also checks consistency of new stores */
 
   {
     char const *subs[2] = { ato + repolen + 9, bun + repolen + 9 } ;
@@ -232,7 +157,7 @@ int s6rc_repo_sync (char const *repo, char const *const *sources, size_t sources
   }
 
 
- /* Switch to the new sources, delete the old ones */
+ /* Switch, delete links to old stores */
 
   {
     char fn[repolen + 18] ;
@@ -278,7 +203,7 @@ int s6rc_repo_sync (char const *repo, char const *const *sources, size_t sources
       d = readdir(dir) ;
       if (!d) break ;
       if (d->d_name[0] == '.') continue ;
-      if (!s6rc_repo_syncset(repo, repolen, d->d_name, &sa, &ga, verbosity)) break ;
+      if (!s6rc_repo_syncset_tmp(repo, d->d_name, &sa, &ga, verbosity)) break ;
     }
     dir_close(dir) ;
     genalloc_free(size_t, &ga) ;
diff --git a/src/libs6rc/s6rc_repo_syncset.c b/src/libs6rc/s6rc_repo_syncset.c
new file mode 100644
index 0000000..929d9c4
--- /dev/null
+++ b/src/libs6rc/s6rc_repo_syncset.c
@@ -0,0 +1,16 @@
+/* ISC license. */
+
+#include <skalibs/stralloc.h>
+#include <skalibs/genalloc.h>
+
+#include <s6-rc/repo.h>
+
+int s6rc_repo_syncset (char const *repo, char const *set, unsigned int verbosity)
+{
+  stralloc sa = STRALLOC_ZERO ;
+  genalloc ga = GENALLOC_ZERO ;  /* size_t */
+  int r = s6rc_repo_syncset_tmp(repo, set, &sa, &ga, verbosity) ;
+  genalloc_free(&size_t, &ga) ;
+  stralloc_free(&sa) ;
+  return r ;
+}
diff --git a/src/libs6rc/s6rc_repo_syncset_tmp.c b/src/libs6rc/s6rc_repo_syncset_tmp.c
new file mode 100644
index 0000000..d9bb358
--- /dev/null
+++ b/src/libs6rc/s6rc_repo_syncset_tmp.c
@@ -0,0 +1,104 @@
+/* ISC license. */
+
+#include <skalibs/nonposix.h>  /* mkdtemp */
+
+#include <string.h>
+#include <stdint.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include <skalibs/direntry.h>
+#include <skalibs/posixplz.h>
+#include <skalibs/strerr.h>
+#include <skalibs/stralloc.h>
+#include <skalibs/genalloc.h>
+
+#include <s6-rc/s6rc-utils.h>
+#include <s6-rc/repo.h>
+
+static int unlink_stales_in_sub (char const *repo, size_t repolen, char const *set, char const *sub, uint32_t where, stralloc *sa, genalloc *ga, unsigned int verbosity)
+{
+  size_t setlen = strlen(set) ;
+  size_t sublen = strlen(sub) ;
+  size_t subfnlen = repolen + setlen + sublen + 10 ;
+  char subfn[subfnlen + 1] ;
+  memcpy(subfn, repo, repolen) ;
+  memcpy(subfn + repolen, "/sources/", 9) ;
+  memcpy(subfn + repolen + 9, set, setlen) ;
+  subfn[repolen + 9 + setlen] = '/' ;
+  memcpy(subfn + repolen + 10 + setlen, sub, sublen + 1) ;
+  DIR *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[subfnlen + len + 2] ;
+    memcpy(fn, subfn, sublen) ;
+    fn[sublen] = '/' ;
+    memcpy(fn + sublen + 1, d->d_name, len+1) ;
+    if (access(fn, F_OK) == -1)
+    {
+      if (errno != ENOENT)
+      {
+        strerr_warnfu2sys("access ", fn) ;
+        goto err ;
+      }
+      unlink_void(fn) ;
+      if (verbosity >= 3)
+        strerr_warni6x("service ", d->d_name, " does not exist anymore, removed from sub ", sub, " of set ", set) ;
+    }
+    else
+    {
+      if (!genalloc_append(size_t, ga, &sa->len)) goto err ;
+      if (!stralloc_catb(sa, d->d_name, len+1)) goto err ;
+    }
+  }
+  if (errno)
+  {
+    strerr_warnfu2sys("readdir ", subfn) ;
+    goto err ;
+  }
+
+  dir_close(dir) ;
+  return 1 ;
+
+ err:
+  dir_close(dir) ;
+  return 0 ;
+}
+
+int s6rc_repo_syncset_tmp (char const *repo, char const *set, stralloc *sa, genalloc *ga, unsigned int verbosity)
+{
+  size_t repolen = strlen(repo) ;
+  size_t sabase = sa->len ;
+  size_t gabase = genalloc_len(size_t, ga) ;
+
+  for (unsigned int i = 0 ; i < 4 ; i++)
+    if (unlink_stales_in_sub(repo, repolen, set, s6rc_repo_subnames[i], i, sa, ga, verbosity)) goto err ;
+
+  {
+    uint32_t n = genalloc_len(size_t, ga) ;
+    char const *stillhere[n + !n] ;
+    for (uint32_t i = 0 ; i < n ; i++) stillhere[i] = sa->s + genalloc_s(size_t, ga)[i] ;
+    if (!s6rc_repo_fillset(repo, set, stillhere, n)) goto err ;
+  }
+
+  sa->len = sabase ;
+  genalloc_setlen(size_t, ga, gabase) ;
+  return 1 ;
+
+ err:
+  sa->len = sabase ;
+  genalloc_setlen(size_t, ga, gabase) ;
+  return 0 ;
+}