Add s6-rc-set-install, repodefs page

4 files changed, 88 insertions, 1 deletions

diff --git a/src/libs6rc/deps-lib/s6rc b/src/libs6rc/deps-lib/s6rc
index 79c2909..02797a8 100644
--- a/src/libs6rc/deps-lib/s6rc
+++ b/src/libs6rc/deps-lib/s6rc
@@ -16,6 +16,7 @@ s6rc_ls.o
 s6rc_nlto0.o
 s6rc_read_uint.o
 s6rc_repo_badsub.o
+s6rc_repo_checkset.o
 s6rc_repo_cleanup.o
 s6rc_repo_compile.o
 s6rc_repo_fillset.o
@@ -36,6 +37,7 @@ s6rc_repo_makesvlist_byname.o
 s6rc_repo_moveservices.o
 s6rc_repo_refcompile.o
 s6rc_repo_setcompile.o
+s6rc_repo_setuptodate.o
 s6rc_repo_subnames.o
 s6rc_repo_sv_bcmpr.o
 s6rc_repo_sv_cmpr.o
diff --git a/src/libs6rc/s6rc_repo_checkset.c b/src/libs6rc/s6rc_repo_checkset.c
new file mode 100644
index 0000000..adf8674
--- /dev/null
+++ b/src/libs6rc/s6rc_repo_checkset.c
@@ -0,0 +1,40 @@
+/* ISC license. */
+
+#include <string.h>
+#include <errno.h>
+
+#include <skalibs/stat.h>
+#include <skalibs/strerr.h>
+
+#include <s6-rc/s6rc-utils.h>
+#include <s6-rc/repo.h>
+
+int s6rc_repo_checkset (char const *repo, char const *set)
+{
+  struct stat st ;
+  size_t repolen = strlen(repo) ;
+  size_t setlen = strlen(set) ;
+  char fn[repolen + 10 + setlen] ;
+  memcpy(fn, repo, repolen) ;
+  memcpy(fn + repolen, "/sources/", 9) ;
+  memcpy(fn + repolen + 9, set, setlen + 1) ;
+  if (stat(fn, &st) == -1)
+  {
+    if (errno == ENOENT)
+    {
+      strerr_warnf4x("set ", set, " does not exist in repository ", repo) ;
+      return 3 ;
+    }
+    else
+    {
+      strerr_warnfu2sys("stat ", fn) ;
+      return 111 ;
+    }
+  }
+  if (!S_ISDIR(st.st_mode))
+  {
+    strerr_warnf3x("file ", fn, " is not a directory") ;
+    return 102 ;
+  }
+  return 0 ;
+}
diff --git a/src/libs6rc/s6rc_repo_compile.c b/src/libs6rc/s6rc_repo_compile.c
index b31a981..ac4207d 100644
--- a/src/libs6rc/s6rc_repo_compile.c
+++ b/src/libs6rc/s6rc_repo_compile.c
@@ -93,7 +93,7 @@ int s6rc_repo_compile (char const *repo, char const *set, char const *const *sub
     char fn[repolen + setlen + 11] ;
     memcpy(fn, newc, repolen + 10) ;
     memcpy(fn + repolen + 10, set, setlen + 1) ;
-    if (!atomic_symlink4(newc + repolen + 10, fn, oldc + repolen + 10, repolen + setlen + 45))
+    if (!atomic_symlink4(newc + repolen + 10, fn, oldc + repolen + 10, setlen + 35))
     {
       int e = errno ;
       rm_rf(newc) ;
diff --git a/src/libs6rc/s6rc_repo_setuptodate.c b/src/libs6rc/s6rc_repo_setuptodate.c
new file mode 100644
index 0000000..9e9fe58
--- /dev/null
+++ b/src/libs6rc/s6rc_repo_setuptodate.c
@@ -0,0 +1,45 @@
+/* ISC license. */
+
+#include <skalibs/bsdsnowflake.h>
+
+#include <string.h>
+#include <errno.h>
+
+#include <skalibs/stat.h>
+#include <skalibs/strerr.h>
+
+#include <s6-rc/s6rc-utils.h>
+#include <s6-rc/repo.h>
+
+int s6rc_repo_setuptodate (char const *repo, char const *set)
+{
+  struct stat stsource ;
+  struct stat stcompiled ;
+  size_t repolen = strlen(repo) ;
+  size_t setlen = strlen(set) ;
+  char srcfn[repolen + 17 + setlen] ;
+  char dstfn[repolen + 11 + setlen] ;
+  memcpy(srcfn, repo, repolen) ;
+  memcpy(srcfn + repolen, "/sources/", 9) ;
+  memcpy(srcfn + repolen + 9, set, setlen) ;
+  memcpy(srcfn + repolen + 9 + setlen, "/.stamp", 8) ;
+  memcpy(dstfn, repo, repolen) ;
+  memcpy(dstfn + repolen, "/compiled/", 10) ;
+  memcpy(dstfn + repolen + 10, set, setlen + 1) ;
+  if (stat(srcfn, &stsource) == -1)
+  {
+    strerr_warnfu2sys("stat ", srcfn) ;
+    return -1 ;
+  }
+  if (stat(dstfn, &stcompiled) == -1)
+  {
+    if (errno == ENOENT) return 0 ;
+    strerr_warnfu2sys("stat ", dstfn) ;
+    return -1 ;
+  }
+  return
+    stsource.st_atim.tv_sec < stcompiled.st_atim.tv_sec ? 1 :
+    stsource.st_atim.tv_sec > stcompiled.st_atim.tv_sec ? 0 :
+    stsource.st_atim.tv_nsec < stcompiled.st_atim.tv_nsec ;
+}
+