aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/repo/deps-exe/s6-rc-set-copy2
-rw-r--r--src/repo/deps-exe/s6-rc-set-delete2
-rw-r--r--src/repo/s6-rc-set-copy.c87
-rw-r--r--src/repo/s6-rc-set-delete.c73
-rw-r--r--src/repo/s6-rc-set-new.c29
5 files changed, 178 insertions, 15 deletions
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") ;
generated by cgit v1.3.1 (git 2.54.0) at 2026-07-16 05:03:56 +0000