Add set-copy, set-delete

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

9 files changed, 193 insertions, 17 deletions

diff --git a/.gitignore b/.gitignore
index b04357a..f0481c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@
 /s6-rc-repo-init
 /s6-rc-repo-populate
 /s6-rc-set-new
+/s6-rc-set-copy
+/s6-rc-set-delete
diff --git a/package/deps.mak b/package/deps.mak
index c1d01d5..02a26f3 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -21,7 +21,7 @@ src/libs6rc/s6rc_lock.o src/libs6rc/s6rc_lock.lo: src/libs6rc/s6rc_lock.c src/in
 src/libs6rc/s6rc_read_uint.o src/libs6rc/s6rc_read_uint.lo: src/libs6rc/s6rc_read_uint.c src/include/s6-rc/s6rc-utils.h
 src/libs6rc/s6rc_repo_cleanup.o src/libs6rc/s6rc_repo_cleanup.lo: src/libs6rc/s6rc_repo_cleanup.c src/include/s6-rc/repo.h
 src/libs6rc/s6rc_repo_lock.o src/libs6rc/s6rc_repo_lock.lo: src/libs6rc/s6rc_repo_lock.c src/include/s6-rc/repo.h
-src/libs6rc/s6rc_repo_sync.o src/libs6rc/s6rc_repo_sync.lo: src/libs6rc/s6rc_repo_sync.c src/include/s6-rc/repo.h
+src/libs6rc/s6rc_repo_sync.o src/libs6rc/s6rc_repo_sync.lo: src/libs6rc/s6rc_repo_sync.c src/include/s6-rc/repo.h src/include/s6-rc/s6rc-utils.h
 src/libs6rc/s6rc_sanitize_dir.o src/libs6rc/s6rc_sanitize_dir.lo: src/libs6rc/s6rc_sanitize_dir.c src/include/s6-rc/s6rc-utils.h
 src/libs6rc/s6rc_servicedir_block.o src/libs6rc/s6rc_servicedir_block.lo: src/libs6rc/s6rc_servicedir_block.c src/include/s6-rc/s6rc-servicedir.h
 src/libs6rc/s6rc_servicedir_copy_offline.o src/libs6rc/s6rc_servicedir_copy_offline.lo: src/libs6rc/s6rc_servicedir_copy_offline.c src/include/s6-rc/s6rc-servicedir.h src/libs6rc/s6rc-servicedir-internal.h
@@ -32,6 +32,8 @@ src/libs6rc/s6rc_servicedir_unblock.o src/libs6rc/s6rc_servicedir_unblock.lo: sr
 src/libs6rc/s6rc_servicedir_unsupervise.o src/libs6rc/s6rc_servicedir_unsupervise.lo: src/libs6rc/s6rc_servicedir_unsupervise.c src/include/s6-rc/s6rc-servicedir.h
 src/libs6rc/s6rc_type_check.o src/libs6rc/s6rc_type_check.lo: src/libs6rc/s6rc_type_check.c src/include/s6-rc/s6rc-utils.h
 src/repo/s6-rc-repo-init.o src/repo/s6-rc-repo-init.lo: src/repo/s6-rc-repo-init.c src/include/s6-rc/config.h src/include/s6-rc/s6rc.h
+src/repo/s6-rc-set-copy.o src/repo/s6-rc-set-copy.lo: src/repo/s6-rc-set-copy.c src/include/s6-rc/config.h src/include/s6-rc/s6rc.h
+src/repo/s6-rc-set-delete.o src/repo/s6-rc-set-delete.lo: src/repo/s6-rc-set-delete.c src/include/s6-rc/config.h src/include/s6-rc/s6rc.h
 src/repo/s6-rc-set-new.o src/repo/s6-rc-set-new.lo: src/repo/s6-rc-set-new.c src/include/s6-rc/config.h src/include/s6-rc/s6rc.h
 src/s6-rc/s6-rc-bundle.o src/s6-rc/s6-rc-bundle.lo: src/s6-rc/s6-rc-bundle.c src/include/s6-rc/config.h src/include/s6-rc/s6rc.h
 src/s6-rc/s6-rc-compile.o src/s6-rc/s6-rc-compile.lo: src/s6-rc/s6-rc-compile.c src/include/s6-rc/config.h src/include/s6-rc/s6rc.h
@@ -56,6 +58,10 @@ libs6rc.dylib.xyzzy: EXTRA_LIBS := -ls6 -lskarnet
 libs6rc.dylib.xyzzy:src/libs6rc/s6rc_db_check_depcycles.lo src/libs6rc/s6rc_db_check_pipelines.lo src/libs6rc/s6rc_db_check_revdeps.lo src/libs6rc/s6rc_db_read.lo src/libs6rc/s6rc_db_read_sizes.lo src/libs6rc/s6rc_db_read_uint32.lo src/libs6rc/s6rc_graph_closure.lo src/libs6rc/s6rc_live_state_size.lo src/libs6rc/s6rc_live_state_read.lo src/libs6rc/s6rc_livedir_canon.lo src/libs6rc/s6rc_livedir_create.lo src/libs6rc/s6rc_livedir_prefix.lo src/libs6rc/s6rc_livedir_prefixsize.lo src/libs6rc/s6rc_lock.lo src/libs6rc/s6rc_read_uint.lo src/libs6rc/s6rc_repo_cleanup.lo src/libs6rc/s6rc_repo_lock.lo src/libs6rc/s6rc_repo_sync.lo src/libs6rc/s6rc_sanitize_dir.lo src/libs6rc/s6rc_servicedir_internal.lo src/libs6rc/s6rc_servicedir_block.lo src/libs6rc/s6rc_servicedir_unblock.lo src/libs6rc/s6rc_servicedir_copy_offline.lo src/libs6rc/s6rc_servicedir_copy_online.lo src/libs6rc/s6rc_servicedir_manage.lo src/libs6rc/s6rc_servicedir_unsupervise.lo src/libs6rc/s6rc_type_check.lo
 s6-rc-repo-init: EXTRA_LIBS :=
 s6-rc-repo-init: src/repo/s6-rc-repo-init.o ${LIBS6RC} -lskarnet
+s6-rc-set-copy: EXTRA_LIBS :=
+s6-rc-set-copy: src/repo/s6-rc-set-copy.o ${LIBS6RC} -lskarnet
+s6-rc-set-delete: EXTRA_LIBS :=
+s6-rc-set-delete: src/repo/s6-rc-set-delete.o ${LIBS6RC} -lskarnet
 s6-rc-set-new: EXTRA_LIBS :=
 s6-rc-set-new: src/repo/s6-rc-set-new.o ${LIBS6RC} -lskarnet
 s6-rc: EXTRA_LIBS := ${SYSCLOCK_LIB} ${SPAWN_LIB}
diff --git a/package/modes b/package/modes
index 863ca10..9e0d85e 100644
--- a/package/modes
+++ b/package/modes
@@ -9,3 +9,6 @@ s6-rc-fdholder-filler	0755
 s6-rc-oneshot-run	0755
 s6-rc-format-upgrade	0755
 s6-rc-repo-init		0755
+s6-rc-set-new		0755
+s6-rc-set-copy		0755
+s6-rc-set-delete	0755
diff --git a/package/targets.mak b/package/targets.mak
index 80ff22c..df32529 100644
--- a/package/targets.mak
+++ b/package/targets.mak
@@ -8,7 +8,9 @@ s6-rc \
 s6-rc-update \
 s6-rc-format-upgrade \
 s6-rc-repo-init \
-s6-rc-set-new
+s6-rc-set-new \
+s6-rc-set-copy \
+s6-rc-set-delete \
 
 LIBEXEC_TARGETS := \
 s6-rc-fdholder-filler \
diff --git a/src/repo/deps-exe/s6-rc-set-copy b/src/repo/deps-exe/s6-rc-set-copy
new file mode 100644
index 0000000..152b051
--- /dev/null
+++ b/src/repo/deps-exe/s6-rc-set-copy
@@ -0,0 +1,2 @@
+${LIBS6RC}
+-lskarnet
diff --git a/src/repo/deps-exe/s6-rc-set-delete b/src/repo/deps-exe/s6-rc-set-delete
new file mode 100644
index 0000000..152b051
--- /dev/null
+++ b/src/repo/deps-exe/s6-rc-set-delete
@@ -0,0 +1,2 @@
+${LIBS6RC}
+-lskarnet
diff --git a/src/repo/s6-rc-set-copy.c b/src/repo/s6-rc-set-copy.c
new file mode 100644
index 0000000..b084c7d
--- /dev/null
+++ b/src/repo/s6-rc-set-copy.c
@@ -0,0 +1,87 @@
+/* ISC license. */
+
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include <skalibs/posixplz.h>
+#include <skalibs/prog.h>
+#include <skalibs/strerr.h>
+#include <skalibs/gol.h>
+#include <skalibs/djbunix.h>
+
+#include <s6-rc/config.h>
+#include <s6-rc/s6rc.h>
+
+#define USAGE "s6-rc-set-copy [ -v verbosity ] [ -r repo ] srcset dstset"
+#define dieusage() strerr_dieusage(100, USAGE)
+
+static void cleanup (char const *fn)
+{
+  int e = errno ;
+  rm_rf(fn) ;
+  errno = e ;
+}
+
+static inline void docopy (char const *repo, char const *srcname, char const *dstname)
+{
+  size_t repolen = strlen(repo) ;
+  size_t srclen = strlen(srcname) ;
+  size_t dstlen = strlen(dstname) ;
+  char src[repolen + srclen + 10] ;
+  char dst[repolen + dstlen + 10] ;
+  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) ;
+  if (access(dst, F_OK) == -1)
+  {
+    if (errno != ENOENT) strerr_diefu2sys(111, "access ", dst) ;
+  }
+  else strerr_dief4x(100, "set ", dstname, " already exists in repository ", repo) ;
+  if (!hiercopy(src, dst))
+  {
+    cleanup(dst) ;
+    strerr_diefu4sys(111, "copy ", src, " to ", dst) ;
+  }
+}
+
+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 ;
+  int fdlock ;
+  unsigned int verbosity = 1 ;
+  char const *wgola[2] = { 0 } ;
+  unsigned int golc ;
+
+  PROG = "s6-rc-set-copy" ;
+  golc = gol_main(argc, argv, 0, 0, rgola, 2, 0, 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 < 2) dieusage() ;
+  for (unsigned int i = 0 ; i < 2 ; 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) ;
+
+  docopy(repo, argv[0], argv[1]) ;
+  return 0 ;
+}
diff --git a/src/repo/s6-rc-set-delete.c b/src/repo/s6-rc-set-delete.c
new file mode 100644
index 0000000..e45561f
--- /dev/null
+++ b/src/repo/s6-rc-set-delete.c
@@ -0,0 +1,73 @@
+/* ISC license. */
+
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include <skalibs/posixplz.h>
+#include <skalibs/prog.h>
+#include <skalibs/strerr.h>
+#include <skalibs/gol.h>
+#include <skalibs/djbunix.h>
+
+#include <s6-rc/config.h>
+#include <s6-rc/s6rc.h>
+
+#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)
+{
+  size_t repolen = strlen(repo) ;
+  size_t setlen = strlen(setname) ;
+  char fn[repolen + setlen + 10] ;
+  memcpy(fn, repo, repolen) ;
+  memcpy(fn + repolen, "/sources/", 9) ;
+  memcpy(fn + repolen + 9, setname, setlen + 1) ;
+  if (access(fn, W_OK) == -1)
+  {
+    if (errno != ENOENT) strerr_diefu2sys(111, "access ", fn) ;
+    else strerr_warnwu2sys("delete set ", setname) ;
+  }
+  else rm_rf(fn) ;
+}
+
+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 ;
+  int fdlock ;
+  unsigned int verbosity = 1 ;
+  char const *wgola[2] = { 0 } ;
+  unsigned int golc ;
+
+  PROG = "s6-rc-set-delete" ;
+  golc = gol_main(argc, argv, 0, 0, rgola, 2, 0, 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) ;
+
+  for (unsigned int i = 0 ; i < argc ; i++)
+    dodelete(repo, argv[i]) ;
+  return 0 ;
+}
diff --git a/src/repo/s6-rc-set-new.c b/src/repo/s6-rc-set-new.c
index 9dddce6..0304db1 100644
--- a/src/repo/s6-rc-set-new.c
+++ b/src/repo/s6-rc-set-new.c
@@ -33,7 +33,6 @@ static void cleanup (char const *fn)
 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) ;
@@ -47,7 +46,19 @@ static inline void newset (char const *repo, size_t repolen, char const *everyth
   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) ;
+
+  {
+    char lock[repolen + 28 + setlen] ;
+    memcpy(lock, tmp, repolen + 21 + setlen) ;
+    memcpy(lock + repolen + 21 + setlen, "/.lock", 7) ;
+    if (!openwritenclose_unsafe(lock, "", 0))
+    {
+      cleanup(tmp) ;
+      strerr_diefu2sys(111, "create ", lock) ;
+    }
+  }
+
+  DIR *dir = opendir(everything) ;
   for (;;)
   {
     size_t len ;
@@ -89,17 +100,6 @@ static inline void newset (char const *repo, size_t repolen, char const *everyth
   }
 }
 
-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,
@@ -120,11 +120,10 @@ int main (int argc, char const *const *argv)
   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) ;
+  golc = gol_main(argc, argv, 0, 0, rgola, 2, 0, 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") ;