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

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

5 files changed, 80 insertions, 19 deletions

diff --git a/src/libs6rc/deps-lib/s6rc b/src/libs6rc/deps-lib/s6rc
index 71a1616..e4a3027 100644
--- a/src/libs6rc/deps-lib/s6rc
+++ b/src/libs6rc/deps-lib/s6rc
@@ -14,6 +14,7 @@ s6rc_livedir_prefixsize.o
 s6rc_lock.o
 s6rc_read_uint.o
 s6rc_repo_cleanup.o
+s6rc_repo_lock.o
 s6rc_repo_sync.o
 s6rc_sanitize_dir.o
 s6rc_servicedir_internal.o
@@ -23,5 +24,6 @@ s6rc_servicedir_copy_offline.o
 s6rc_servicedir_copy_online.o
 s6rc_servicedir_manage.o
 s6rc_servicedir_unsupervise.o
+s6rc_type_check.o
 -ls6
 -lskarnet
diff --git a/src/libs6rc/s6rc_repo_cleanup.c b/src/libs6rc/s6rc_repo_cleanup.c
index 9b42c06..d64fe83 100644
--- a/src/libs6rc/s6rc_repo_cleanup.c
+++ b/src/libs6rc/s6rc_repo_cleanup.c
@@ -51,8 +51,12 @@ static inline int sub_cleanup (char const *subdir)
 
 int s6rc_repo_cleanup (char const *repo)
 {
+  DIR *dir ;
   size_t repolen = strlen(repo) ;
-  DIR *dir = opendir(repo) ;
+  char sources[repolen + 9] ;
+  memcpy(sources, repo, repolen) ;
+  memcpy(sources + repolen, "/sources", 9) ;
+  dir = opendir(sources) ;
   if (!dir) return 0 ;
   for (;;)
   {
@@ -64,10 +68,10 @@ int s6rc_repo_cleanup (char const *repo)
     if (d->d_name[0] == '.') continue ;
     len = strlen(d->d_name) ;
     {
-      char fn[repolen + len + 2] ;
-      memcpy(fn, repo, repolen) ;
-      fn[repolen] = '/' ;
-      memcpy(fn + repolen + 1, d->d_name, len + 1) ;
+      char fn[repolen + len + 10] ;
+      memcpy(fn, sources, repolen + 8) ;
+      fn[repolen + 8] = '/' ;
+      memcpy(fn + repolen + 9, d->d_name, len + 1) ;
       if (!sub_cleanup(fn)) break ;
     }
   }
diff --git a/src/libs6rc/s6rc_repo_lock.c b/src/libs6rc/s6rc_repo_lock.c
new file mode 100644
index 0000000..472ff15
--- /dev/null
+++ b/src/libs6rc/s6rc_repo_lock.c
@@ -0,0 +1,20 @@
+/* ISC license. */
+
+#include <string.h>
+
+#include <skalibs/djbunix.h>
+
+#include <s6-rc/repo.h>
+
+int s6rc_repo_lock (char const *repo, int w)
+{
+  int fd ;
+  size_t repolen = strlen(repo) ;
+  char fn[repolen + 13] ;
+  memcpy(fn, repo, repolen) ;
+  memcpy(fn + repolen, "/lock", 6) ;
+  fd = openc_write(fn) ;
+  if (fd == -1) return -1 ;
+  if (fd_lock(fd, w, 0) < 1) return -1 ;
+  return fd ;
+}
diff --git a/src/libs6rc/s6rc_repo_sync.c b/src/libs6rc/s6rc_repo_sync.c
index 963ec3c..1fb8d65 100644
--- a/src/libs6rc/s6rc_repo_sync.c
+++ b/src/libs6rc/s6rc_repo_sync.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <skalibs/bsdsnowflake.h>  /* stat */
 #include <skalibs/nonposix.h>  /* mkdtemp */
 
 #include <string.h>
@@ -8,7 +7,6 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include <skalibs/stat.h>
 #include <skalibs/direntry.h>
 #include <skalibs/posixplz.h>
 #include <skalibs/strerr.h>
@@ -16,6 +14,7 @@
 #include <skalibs/djbunix.h>
 #include <skalibs/unix-transactional.h>
 
+#include <s6-rc/s6rc-utils.h>
 #include <s6-rc/repo.h>
 
 static inline void cleanup (char const *fn)
@@ -57,25 +56,27 @@ int s6rc_repo_sync (char const *repo, char const *const *sources, size_t sources
       if (d->d_name[0] == '.') continue ;
       len = strlen(d->d_name) ;
       {
-        struct stat st ;
         char dst[repolen + 25 + len] ;
         char src[srclen + len + 2] ;
         memcpy(dst, newdir, repolen + 23) ;
         dst[repolen + 23] = '/' ;
-        memcpy(dst + repolen + 24, d->d_name, len + 1) ;
+        memcpy(dst + repolen + 24, d->d_name, len+1) ;
         memcpy(src, sources[i], srclen) ;
         src[srclen] = '/' ;
-        memcpy(src + srclen + 1, d->d_name, len + 1) ;
-        if (stat(src, &st) == -1)
+        memcpy(src + srclen + 1, d->d_name, len+1) ;
+        switch (s6rc_type_check(-1, src))
         {
-          if (verbosity) strerr_warnwu2sys("stat ", src) ;
-          continue ;
-        }
-        if (!S_ISDIR(st.st_mode))
-        {
-          errno = ENOTDIR ;
-          if (verbosity) strerr_warnwu2sys("link ", src) ;
-          continue ;
+          case 1 :
+          case 2 :
+          case 3 : break ;
+          case 0 :
+            strerr_warnf2x("invalid service type for ", src) ;
+            dir_close(dir) ;
+            goto err ;
+          default :
+            strerr_warnfu2sys("check service type of ", src) ;
+            dir_close(dir) ;
+            goto err ;
         }
         if (symlink(src, dst) == -1)
         {
@@ -110,6 +111,7 @@ int s6rc_repo_sync (char const *repo, char const *const *sources, size_t sources
 
   if (chmod(newdir, 02755) == -1)
   {
+    strerr_warnfu2sys("chmod ", newdir) ;
     goto err ;
   }
 
diff --git a/src/libs6rc/s6rc_type_check.c b/src/libs6rc/s6rc_type_check.c
new file mode 100644
index 0000000..9ce84b9
--- /dev/null
+++ b/src/libs6rc/s6rc_type_check.c
@@ -0,0 +1,33 @@
+/* ISC license. */
+
+#include <string.h>
+#include <errno.h>
+
+#include <skalibs/djbunix.h>
+#include <skalibs/unix-transactional.h>
+
+#include <s6-rc/s6rc-utils.h>
+
+int s6rc_type_check (int dfd, char const *src)
+{
+  char type[8] ;
+  ssize_t r ;
+  if (dfd >= 0) r = openreadnclose_at(dfd, "type", type, 8) ;
+  else
+  {
+    size_t srclen = strlen(src) ;
+    char fn[srclen + 6] ;
+    memcpy(fn, src, srclen) ;
+    memcpy(fn + srclen, "/type", 6) ;
+    r = openreadnclose(fn, type, 8) ;
+  }
+  if (r == -1) return -1 ;
+  if (r < 6) return 0 ;
+  if (type[r-1] == '\n') r-- ;
+  if (r == 8) return 0 ;
+  type[r++] = 0 ;
+  return
+    !strcmp(type, "longrun") ? 1 :
+    !strcmp(type, "oneshot") ? 2 :
+    !strcmp(type, "bundle")  ? 3 : 0 ;
+}