s6-rc-set-new, refactors, additions, etc.

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

3 files changed, 158 insertions, 3 deletions

diff --git a/src/repo/deps-exe/s6-rc-set-new b/src/repo/deps-exe/s6-rc-set-new
new file mode 100644
index 0000000..152b051
--- /dev/null
+++ b/src/repo/deps-exe/s6-rc-set-new
@@ -0,0 +1,2 @@
+${LIBS6RC}
+-lskarnet
diff --git a/src/repo/s6-rc-repo-init.c b/src/repo/s6-rc-repo-init.c
index 6a321c8..584d079 100644
--- a/src/repo/s6-rc-repo-init.c
+++ b/src/repo/s6-rc-repo-init.c
@@ -70,8 +70,6 @@ int main (int argc, char const *const *argv)
   if (wgola[GOLA_VERBOSITY] && !uint0_scan(wgola[GOLA_VERBOSITY], &verbosity))
     strerr_dief1x(100, "verbosity needs to be an unsigned integer") ;
   if (wgola[GOLA_REPODIR]) repo = wgola[GOLA_REPODIR] ;
-  if (repo[0] != '/')
-    strerr_dief2x(100, repo, " is not an absolute path") ;
   for (unsigned int i = 0 ; i < argc ; i++)
     if (argv[i][0] != '/')
       strerr_dief2x(100, argv[i], " is not an absolute path") ;
@@ -107,7 +105,7 @@ int main (int argc, char const *const *argv)
     strerr_diefu2sys(111, "mkdir ", tmp) ;
   }
 
-  memcpy(tmp + repolen + 12, "source", 7) ;
+  memcpy(tmp + repolen + 12, "sources", 8) ;
   if (mkdir(tmp, 02755) == -1)
   {
     cleanup(repotmp) ;
@@ -116,6 +114,13 @@ int main (int argc, char const *const *argv)
 
   umask(m) ;
 
+  memcpy(tmp + repolen + 12, "lock", 5) ;
+  if (!openwritenclose_unsafe5(tmp, "", 0, 0, 0))
+  {
+    cleanup(repotmp) ;
+    strerr_diefu2sys(111, "create ", tmp) ;
+  }
+
   if (!s6rc_repo_sync(repotmp, argv, argc, verbosity))
   {
     cleanup(repotmp) ;
diff --git a/src/repo/s6-rc-set-new.c b/src/repo/s6-rc-set-new.c
new file mode 100644
index 0000000..9dddce6
--- /dev/null
+++ b/src/repo/s6-rc-set-new.c
@@ -0,0 +1,148 @@
+/* ISC license. */
+
+#include <skalibs/bsdsnowflake.h>  /* stat */
+#include <skalibs/nonposix.h>  /* mkdtemp */
+
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdio.h>  /* rename */
+#include <errno.h>
+
+#include <skalibs/stat.h>
+#include <skalibs/posixplz.h>
+#include <skalibs/gol.h>
+#include <skalibs/prog.h>
+#include <skalibs/strerr.h>
+#include <skalibs/direntry.h>
+#include <skalibs/djbunix.h>
+
+#include <s6-rc/config.h>
+#include <s6-rc/s6rc.h>
+
+#define USAGE "s6-rc-set-new [ -v verbosity ] [ -r repo ] setname..."
+#define dieusage() strerr_dieusage(100, USAGE)
+
+static void cleanup (char const *fn)
+{
+  int e = errno ;
+  rm_rf(fn) ;
+  errno = e ;
+}
+
+static inline void newset (char const *repo, size_t repolen, char const *everything, char const *setname)
+{
+  size_t setlen = strlen(setname) ;
+  DIR *dir ;
+  char fn[repolen + 10 + setlen] ;
+  char tmp[repolen + 21 + setlen] ;
+  memcpy(fn, repo, repolen) ;
+  memcpy(fn + repolen, "/sources/", 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) ;
+  if (!mkdtemp(tmp)) strerr_diefu2sys(111, "mkdtemp ", tmp) ;
+  dir = opendir(everything) ;
+  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 src[16 + len] ;
+    char dst[repolen + 22 + setlen + len] ;
+    memcpy(src, "../.everything/", 15) ;
+    memcpy(src + 15, d->d_name, len+1) ;
+    memcpy(dst, tmp, repolen + 20 + setlen) ;
+    dst[repolen + 20 + setlen] = '/' ;
+    memcpy(dst + repolen + 21 + setlen, d->d_name, len+1) ;
+    if (symlink(src, dst) == -1)
+    {
+      cleanup(tmp) ;
+      strerr_diefu4sys(111, "symlink ", src, " to ", dst) ;
+    }
+  }
+  dir_close(dir) ;
+  if (errno)
+  {
+    cleanup(tmp) ;
+    strerr_diefu2sys(111, "readdir ", tmp) ;
+  }
+
+  if (chmod(tmp, 02755) == -1)
+  {
+    cleanup(tmp) ;
+    strerr_diefu2sys(111, "chmod ", tmp) ;
+  }
+  if (rename(tmp, fn) == -1)
+  {
+    cleanup(tmp) ;
+    strerr_diefu4sys(111, "rename ", tmp, " to ", fn) ;
+  }
+}
+
+enum golb_e
+{
+  GOLB_FORCE,
+  GOLB_N
+} ;
+
+static gol_bool const rgolb[1] =
+{
+  { .so = 'f', .lo = "force", .clear = 0, .set = 1 << GOLB_FORCE }
+} ;
+
+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)
+{
+  size_t repolen ;
+  char const *repo = S6RC_REPO_BASE ;
+  int fdlock ;
+  unsigned int verbosity = 1 ;
+  char const *wgola[2] = { 0 } ;
+  uint64_t wgolb = 0 ;
+  unsigned int golc ;
+
+  PROG = "s6-rc-set-new" ;
+  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") ;
+  if (wgola[GOLA_REPODIR]) repo = wgola[GOLA_REPODIR] ;
+  if (!argc) dieusage() ;
+  for (unsigned int i = 0 ; i < argc ; i++)
+    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) ;
+
+  repolen = strlen(repo) ;
+  char fn[repolen + 13] ;
+  memcpy(fn, repo, repolen) ;
+  memcpy(fn + repolen, "/.everything", 13) ;
+  for (unsigned int i = 0 ; i < argc ; i++)
+    newset(repo, repolen, fn, argv[i]) ;
+
+  return 0 ;
+}