Major refactors, add makesetbundle, refcompile/setcompile, etc.

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

1 files changed, 38 insertions, 7 deletions

diff --git a/src/repo/s6-rc-set-delete.c b/src/repo/s6-rc-set-delete.c
index 8885e0c..2750abb 100644
--- a/src/repo/s6-rc-set-delete.c
+++ b/src/repo/s6-rc-set-delete.c
@@ -9,6 +9,7 @@
 #include <skalibs/strerr.h>
 #include <skalibs/gol.h>
 #include <skalibs/tai.h>
+#include <skalibs/direntry.h>
 #include <skalibs/djbunix.h>
 
 #include <s6-rc/config.h>
@@ -17,18 +18,17 @@
 #define USAGE "s6-rc-set-delete [ -v verbosity ] [ -r repo ] setname..."
 #define dieusage() strerr_dieusage(100, USAGE)
 
-static inline void dodelete (char const *repo, char const *setname)
+static inline void dodelete (char const *repo, char const *set)
 {
   size_t repolen = strlen(repo) ;
-  size_t setlen = strlen(setname) ;
-  char fn[repolen + setlen + 10] ;
+  size_t setlen = strlen(set) ;
+  char fn[repolen + setlen + 11] ;
   memcpy(fn, repo, repolen) ;
   memcpy(fn + repolen, "/sources/", 9) ;
-  memcpy(fn + repolen + 9, setname, setlen + 1) ;
+  memcpy(fn + repolen + 9, set, setlen + 1) ;
   if (access(fn, W_OK) == -1)
   {
     if (errno != ENOENT) strerr_diefu2sys(111, "access ", fn) ;
-    else strerr_warnwu2sys("delete set ", setname) ;
   }
   else
   {
@@ -40,9 +40,34 @@ static inline void dodelete (char const *repo, char const *setname)
     if (r == -1) strerr_diefu2sys(111, "readlink ", fn) ;
     else if (r != 8) strerr_dief3x(102, "symlink ", fn, " points to an invalid name") ;
     real[repolen + setlen + 17] = 0 ;
-    if (unlink(fn) == -1) strerr_diefu2sys(111, "unlink ", fn) ;
+    unlink_void(fn) ;
     rm_rf(real) ;
   }
+
+  memcpy(fn + repolen + 1, "compiled/", 9) ;
+  memcpy(fn + repolen + 10, set, setlen + 1) ;
+  unlink_void(fn) ;
+  fn[repolen + 9] = 0 ;
+  DIR *dir = opendir(fn) ;
+  if (!dir) strerr_diefu2sys(111, "opendir ", fn) ;
+  for (;;)
+  {
+    direntry *d ;
+    errno = 0 ;
+    d = readdir(dir) ;
+    if (!d) break ;
+    if (d->d_name[0] == '.' && !strncmp(d->d_name + 1, set, setlen) && d->d_name[1 + setlen] == ':' && strlen(d->d_name + 2 + setlen) == 6)
+    {
+      size_t len = strlen(d->d_name) ;
+      char tmp[repolen + 11 + len] ;
+      memcpy(tmp, fn, repolen + 9) ;
+      tmp[repolen + 9] = '/' ;
+      memcpy(tmp + repolen + 10, d->d_name, len + 1) ;
+      rm_rf(tmp) ;
+    }
+  }
+  if (errno) strerr_diefu2sys(111, "readdir ", fn) ;
+  dir_close(dir) ;
 }
 
 enum gola_e
@@ -74,8 +99,14 @@ int main (int argc, char const *const *argv)
   if (wgola[GOLA_REPODIR]) repo = wgola[GOLA_REPODIR] ;
   if (!argc) dieusage() ;
   for (unsigned int i = 0 ; i < argc ; i++)
+  {
+    if (!argv[i][0])
+      strerr_dief2x(100, "set names cannot ", "be empty") ;
+    if (argv[i][0] == '.')
+      strerr_dief2x(100, "set names cannot ", "start with a dot") ;
     if (strchr(argv[i], '/') || strchr(argv[i], '\n'))
-      strerr_dief1x(100, "set names cannot contain / or newlines") ;
+      strerr_dief2x(100, "set names cannot ", "contain / or newlines") ;
+  }
 
   fdlock = s6rc_repo_lock(repo, 1) ;
   if (fdlock == -1) strerr_diefu2sys(111, "lock ", repo) ;