1 files changed, 12 insertions, 10 deletions
diff --git a/src/repo/s6rc_repo_syncset_tmp.c b/src/repo/s6rc_repo_syncset_tmp.c
index 0437939..963a87a 100644
--- a/src/repo/s6rc_repo_syncset_tmp.c
+++ b/src/repo/s6rc_repo_syncset_tmp.c
@@ -3,8 +3,10 @@
 #include <string.h>
 #include <stdint.h>
 #include <unistd.h>
+#include <unistd.h>
 #include <errno.h>
 
+#include <skalibs/bytestr.h>
 #include <skalibs/direntry.h>
 #include <skalibs/posixplz.h>
 #include <skalibs/strerr.h>
@@ -13,17 +15,16 @@
 
 #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)
+static int unlink_stales_in_sub (char const *repo, size_t repolen, char const *set, uint8_t sub, stralloc *sa, genalloc *ga, unsigned int verbosity)
 {
   size_t setlen = strlen(set) ;
-  size_t sublen = strlen(sub) ;
-  size_t subfnlen = repolen + setlen + sublen + 10 ;
+  size_t subfnlen = repolen + setlen + 16 ;
   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) ;
+  memcpy(subfn + repolen + 10 + setlen, s6rc_repo_subnames[sub], 7) ;
   DIR *dir = opendir(subfn) ;
   if (!dir)
   {
@@ -40,9 +41,9 @@ static int unlink_stales_in_sub (char const *repo, size_t repolen, char const *s
     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) ;
+    memcpy(fn, subfn, subfnlen) ;
+    fn[subfnlen] = '/' ;
+    memcpy(fn + subfnlen + 1, d->d_name, len+1) ;
     if (access(fn, F_OK) == -1)
     {
       if (errno != ENOENT)
@@ -52,7 +53,7 @@ static int unlink_stales_in_sub (char const *repo, size_t repolen, char const *s
       }
       unlink_void(fn) ;
       if (verbosity >= 3)
-        strerr_warni6x("service ", d->d_name, " does not exist anymore, removed from sub ", sub, " of set ", set) ;
+        strerr_warni6x("service ", d->d_name, " does not exist anymore, removed from sub ", s6rc_repo_subnames[sub], " of set ", set) ;
     }
     else
     {
@@ -80,13 +81,14 @@ int s6rc_repo_syncset_tmp (char const *repo, char const *set, stralloc *sa, gena
   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 ;
+  for (uint8_t sub = 0 ; sub < 4 ; sub++)
+    if (!unlink_stales_in_sub(repo, repolen, set, sub, 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] ;
+    qsort(stillhere, n, sizeof(char const *), &str_cmp) ;
     if (!s6rc_repo_fillset(repo, set, stillhere, n)) goto err ;
   }