first draft of s6rc_repo_set_compile

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

5 files changed, 143 insertions, 55 deletions

diff --git a/src/repo/DESIGN.txt b/src/repo/DESIGN.txt
index 9dbe7b2..990e573 100644
--- a/src/repo/DESIGN.txt
+++ b/src/repo/DESIGN.txt
@@ -5,7 +5,8 @@ compiled/$name-$stamp
 compiled/$name-current ->
 compiled/$name-previous ->
 
-source/.everything
-source/$name
-source/$name/active
-source/$name/masked
+sources/.everything
+sources/$name -> sources/.$name:XXXXXX
+sources/$name/active
+sources/$name/masked
+sources/$name/onboot
diff --git a/src/repo/s6-rc-repo-init.c b/src/repo/s6-rc-repo-init.c
index 2b607f1..7cc1c70 100644
--- a/src/repo/s6-rc-repo-init.c
+++ b/src/repo/s6-rc-repo-init.c
@@ -20,7 +20,7 @@
 #include <s6-rc/config.h>
 #include <s6-rc/s6rc.h>
 
-#define USAGE "s6-rc-repo-init [ -v verbosity ] [ -r repo ] sources..."
+#define USAGE "s6-rc-repo-init [ -v verbosity ] [ -r repo ] [ -h fdhuser ] sources..."
 #define dieusage() strerr_dieusage(100, USAGE)
 
 static void cleanup (char const *fn)
@@ -45,13 +45,15 @@ enum gola_e
 {
   GOLA_VERBOSITY,
   GOLA_REPODIR,
+  GOLA_FDHUSER,
   GOLA_N
 } ;
 
-static gol_arg const rgola[2] =
+static gol_arg const rgola[3] =
 {
   { .so = 'v', .lo = "verbosity", .i = GOLA_VERBOSITY },
-  { .so = 'r', .lo = "repodir", .i = GOLA_REPODIR }
+  { .so = 'r', .lo = "repodir", .i = GOLA_REPODIR },
+  { .so = 'h', .lo = "fdhuser", .i = GOLA_FDHUSER }
 } ;
 
 int main (int argc, char const *const *argv)
@@ -60,12 +62,12 @@ int main (int argc, char const *const *argv)
   char const *repo = S6RC_REPO_BASE ;
   unsigned int verbosity = 1 ;
   mode_t m ;
-  char const *wgola[2] = { 0 } ;
+  char const *wgola[3] = { 0 } ;
   uint64_t wgolb = 0 ;
   unsigned int golc ;
 
   PROG = "s6-rc-repo-init" ;
-  golc = gol_main(argc, argv, rgolb, 1, rgola, 2, &wgolb, wgola) ;
+  golc = gol_main(argc, argv, rgolb, 1, rgola, 3, &wgolb, wgola) ;
   argc -= golc ; argv += golc ;
   if (wgola[GOLA_VERBOSITY] && !uint0_scan(wgola[GOLA_VERBOSITY], &verbosity))
     strerr_dief1x(100, "verbosity needs to be an unsigned integer") ;
@@ -121,7 +123,7 @@ int main (int argc, char const *const *argv)
     strerr_diefu2sys(111, "create ", tmp) ;
   }
 
-  if (!s6rc_repo_sync(repotmp, argv, argc, verbosity))
+  if (!s6rc_repo_sync(repotmp, argv, argc, verbosity, wgola[GOLA_FDHUSER]))
   {
     cleanup(repotmp) ;
     return 111 ;
diff --git a/src/repo/s6-rc-set-copy.c b/src/repo/s6-rc-set-copy.c
index b084c7d..a76a32c 100644
--- a/src/repo/s6-rc-set-copy.c
+++ b/src/repo/s6-rc-set-copy.c
@@ -4,18 +4,47 @@
 #include <unistd.h>
 #include <errno.h>
 
+#include <skalibs/uint64.h>
 #include <skalibs/posixplz.h>
 #include <skalibs/prog.h>
 #include <skalibs/strerr.h>
 #include <skalibs/gol.h>
 #include <skalibs/djbunix.h>
+#include <skalibs/unix-transactional.h>
 
 #include <s6-rc/config.h>
 #include <s6-rc/s6rc.h>
 
-#define USAGE "s6-rc-set-copy [ -v verbosity ] [ -r repo ] srcset dstset"
+#define USAGE "s6-rc-set-copy [ -v verbosity ] [ -r repo ] [ -f ] srcset dstset"
 #define dieusage() strerr_dieusage(100, USAGE)
 
+enum golb_e
+{
+  GOLB_FORCE,
+  GOLB_N
+} ;
+
+enum gola_e
+{
+  GOLA_VERBOSITY,
+  GOLA_REPODIR,
+  GOLA_N
+} ;
+
+static gol_bool const rgolb[1] =
+{
+  { .so = 'f', .lo = "force", .clear = 0, .set = 1 << GOLB_FORCE }
+} ;
+
+static gol_arg const rgola[2] =
+{
+  { .so = 'v', .lo = "verbosity", .i = GOLA_VERBOSITY },
+  { .so = 'r', .lo = "repodir", .i = GOLA_REPODIR }
+} ;
+
+
+static uint64_t wgolb = 0 ;
+
 static void cleanup (char const *fn)
 {
   int e = errno ;
@@ -28,38 +57,53 @@ static inline void docopy (char const *repo, char const *srcname, char const *ds
   size_t repolen = strlen(repo) ;
   size_t srclen = strlen(srcname) ;
   size_t dstlen = strlen(dstname) ;
+  size_t r ;
   char src[repolen + srclen + 10] ;
   char dst[repolen + dstlen + 10] ;
+  char realsrc[repolen + srclen + 18] ;
+  char realdst[repolen + dstlen + 18] ;
+  char olddst[repolen + dstlen + 18] ;
   memcpy(src, repo, repolen) ;
   memcpy(src + repolen, "/sources/", 9) ;
   memcpy(src + repolen + 9, srcname, srclen + 1) ;
   memcpy(dst, src, repolen + 9) ;
   memcpy(dst + repolen + 9, dstname, dstlen + 1) ;
+  olddst[0] = 0 ;
   if (access(dst, F_OK) == -1)
   {
     if (errno != ENOENT) strerr_diefu2sys(111, "access ", dst) ;
   }
+  else if (wgolb & (1 << GOLB_FORCE))
+  {
+    memcpy(olddst, dst, repolen + 9) ;
+    r = readlink(dst, olddst + repolen + 9, dstlen + 9) ;
+    if (r == -1) strerr_diefu2sys(111, "readlink ", dst) ;
+    if (r != dstlen + 8) strerr_dief3x(102, "symlink ", dst, "doesn't point to a valid name") ;
+  }
   else strerr_dief4x(100, "set ", dstname, " already exists in repository ", repo) ;
-  if (!hiercopy(src, dst))
+
+  memcpy(realsrc, src, repolen + 9) ;
+  r = readlink(src, realsrc + repolen + 9, srclen + 9) ;
+  if (r == -1) strerr_diefu2sys(111, "readlink ", src) ;
+  if (r != srclen + 8) strerr_dief3x(102, "symlink ", src, "doesn't point to a valid name") ;
+  realsrc[repolen + srclen + 17] = 0 ;
+  memcpy(realdst, dst, repolen + 9) ;
+  dst[repolen + 9] = '.' ;
+  memcpy(realdst + repolen + 10, dstname, dstlen) ;
+  memcpy(realdst + repolen + 10 + dstlen, realsrc + repolen + 10 + srclen, 8) ;
+  if (!hiercopy(realsrc, realdst))
+  {
+    cleanup(realdst) ;
+    strerr_diefu4sys(111, "copy ", realsrc, " to ", realdst) ;
+  }
+  if (!atomic_symlink4(realdst + repolen + 9, dst, 0, 0))
   {
-    cleanup(dst) ;
-    strerr_diefu4sys(111, "copy ", src, " to ", dst) ;
+    cleanup(realdst) ;
+    strerr_diefu4sys(111, "symlink ", realdst + repolen + 9, " to ", dst) ;
   }
+  if (olddst[0]) cleanup(olddst) ;
 }
 
-enum gola_e
-{
-  GOLA_VERBOSITY,
-  GOLA_REPODIR,
-  GOLA_N
-} ;
-
-static gol_arg const rgola[2] =
-{
-  { .so = 'v', .lo = "verbosity", .i = GOLA_VERBOSITY },
-  { .so = 'r', .lo = "repodir", .i = GOLA_REPODIR }
-} ;
-
 int main (int argc, char const *const *argv)
 {
   char const *repo = S6RC_REPO_BASE ;
@@ -69,7 +113,7 @@ int main (int argc, char const *const *argv)
   unsigned int golc ;
 
   PROG = "s6-rc-set-copy" ;
-  golc = gol_main(argc, argv, 0, 0, rgola, 2, 0, wgola) ;
+  golc = gol_main(argc, argv, rgolb, 1, rgola, 2, &wgolb, wgola) ;
   argc -= golc ; argv += golc ;
   if (wgola[GOLA_VERBOSITY] && !uint0_scan(wgola[GOLA_VERBOSITY], &verbosity))
     strerr_dief1x(100, "verbosity needs to be an unsigned integer") ;
diff --git a/src/repo/s6-rc-set-delete.c b/src/repo/s6-rc-set-delete.c
index e45561f..58fe4f0 100644
--- a/src/repo/s6-rc-set-delete.c
+++ b/src/repo/s6-rc-set-delete.c
@@ -29,7 +29,19 @@ static inline void dodelete (char const *repo, char const *setname)
     if (errno != ENOENT) strerr_diefu2sys(111, "access ", fn) ;
     else strerr_warnwu2sys("delete set ", setname) ;
   }
-  else rm_rf(fn) ;
+  else
+  {
+    ssize_t r ;
+    char real[repolen + setlen + 18] ;
+    memcpy(real, repo, repolen) ;
+    memcpy(real + repolen, "/sources/", 9) ;
+    r = readlink(fn, real + repolen + 9, setlen + 9) ;
+    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) ;
+    rm_rf(real) ;
+  }
 }
 
 enum gola_e
diff --git a/src/repo/s6-rc-set-new.c b/src/repo/s6-rc-set-new.c
index b2ce315..1a56b9d 100644
--- a/src/repo/s6-rc-set-new.c
+++ b/src/repo/s6-rc-set-new.c
@@ -34,63 +34,88 @@ static inline void newset (char const *repo, char const *setname)
 {
   size_t repolen = strlen(repo) ;
   size_t setlen = strlen(setname) ;
-  char everything[repolen + 13] ;
+  char everything[repolen + 21] ;
   char fn[repolen + 10 + setlen] ;
-  char tmp[repolen + 21 + setlen] ;
-  char cur[repolen + 28 + setlen] ;
+  char tmp[repolen + 18 + setlen] ;
+  char act[repolen + 25 + setlen] ;
+  char onb[repolen + 25 + setlen] ;
   memcpy(everything, repo, repolen) ;
-  memcpy(everything + repolen, "/.everything", 13) ;
-  memcpy(fn, repo, repolen) ;
-  memcpy(fn + repolen, "/sources/", 9) ;
+  memcpy(everything + repolen, "/sources/.everything", 21) ;
+  memcpy(fn, everything, repolen + 9) ;
   memcpy(fn + repolen + 9, setname, setlen + 1) ;
   if (access(fn, F_OK) == -1)
   {
     if (errno != ENOENT) strerr_diefu2sys(111, "access ", fn) ;
   }
   else strerr_dief4x(100, "set ", setname, " already exists in repository ", repo) ;
-  memcpy(tmp, fn, repolen + 9 + setlen) ;
-  memcpy(tmp + repolen + 9 + setlen, ":tmp:XXXXXX", 12) ;
+  memcpy(tmp, fn, repolen + 9) ;
+  tmp[repolen + 9] = '.' ;
+  memcpy(tmp + repolen + 10, setname, setlen) ;
+  memcpy(tmp + repolen + 10 + setlen, ":XXXXXX", 8) ;
   if (!mkdtemp(tmp)) strerr_diefu2sys(111, "mkdtemp ", tmp) ;
 
-  memcpy(cur, tmp, repolen + 20 + setlen) ;
-  memcpy(cur + repolen + 20 + setlen, "/lock", 6) ;
-  if (!openwritenclose_unsafe(cur, "", 0))
+  memcpy(act, tmp, repolen + 17 + setlen) ;
+  memcpy(act + repolen + 17 + setlen, "/lock", 6) ;
+  if (!openwritenclose_unsafe(act, "", 0))
   {
     cleanup(tmp) ;
-    strerr_diefu2sys(111, "create ", cur) ;
+    strerr_diefu2sys(111, "create ", act) ;
   }
 
-  memcpy(cur + repolen + 21 + setlen, "masked", 7) ;
-  if (mkdir(cur, 02755) == -1)
+  memcpy(act + repolen + 18 + setlen, "masked", 7) ;
+  if (mkdir(act, 02755) == -1)
   {
     cleanup(tmp) ;
-    strerr_diefu2sys(111, "mkdir ", cur) ;
+    strerr_diefu2sys(111, "mkdir ", act) ;
   }
 
-  memcpy(cur + repolen + 21 + setlen, "active", 7) ;
-  if (mkdir(cur, 02755) == -1)
+  memcpy(act + repolen + 18 + setlen, "onboot", 7) ;
+  if (mkdir(act, 02755) == -1)
   {
     cleanup(tmp) ;
-    strerr_diefu2sys(111, "mkdir ", cur) ;
+    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) ;
   }
 
   DIR *dir = opendir(everything) ;
   for (;;)
   {
+    char *cur = act ;
     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 src[19 + len] ;
-    char dst[repolen + 29 + setlen + len] ;
-    memcpy(src, "../../.everything/", 18) ;
-    memcpy(src + 18, d->d_name, len+1) ;
-    memcpy(dst, cur, repolen + 27 + setlen) ;
-    dst[repolen + 27 + setlen] = '/' ;
-    memcpy(dst + repolen + 28 + setlen, d->d_name, len+1) ;
+    char src[len + 33] ;
+    char dst[repolen + 26 + setlen + len] ;
+    memcpy(src, "../.everything/", 15) ;
+    memcpy(src + 15, d->d_name, len) ;
+    memcpy(src + 15 + len, "/flag-essential", 16) ;
+    if (access(src, F_OK) == -1)
+    {
+      if (errno != ENOENT) strerr_diefu2sys(111, "access ", src) ;
+    }
+    else cur = onb ;
+    memcpy(src + 21 + len, "recommended", 12) ;
+    if (access(src, F_OK) == -1)
+    {
+      if (errno != ENOENT) strerr_diefu2sys(111, "access ", src) ;
+    }
+    else cur = onb ;
+    src[15 + len] = 0 ;
+    memcpy(dst, cur, repolen + 24 + setlen) ;
+    dst[repolen + 24 + setlen] = '/' ;
+    memcpy(dst + repolen + 25 + setlen, d->d_name, len+1) ;
     if (symlink(src, dst) == -1)
     {
       cleanup(tmp) ;
@@ -109,7 +134,7 @@ static inline void newset (char const *repo, char const *setname)
     cleanup(tmp) ;
     strerr_diefu2sys(111, "chmod ", tmp) ;
   }
-  if (rename(tmp, fn) == -1)
+  if (symlink(tmp, fn) == -1)
   {
     cleanup(tmp) ;
     strerr_diefu4sys(111, "rename ", tmp, " to ", fn) ;
@@ -145,8 +170,12 @@ 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_dief1x(100, "set names cannot be empty") ;
+    if (argv[i][0] == '.') strerr_dief1x(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") ;
+  }
 
   fdlock = s6rc_repo_lock(repo, 1) ;
   if (fdlock == -1) strerr_diefu2sys(111, "lock ", repo) ;