Add s6rc_live_state functions

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

4 files changed, 59 insertions, 0 deletions

diff --git a/src/include/s6-rc/s6rc-utils.h b/src/include/s6-rc/s6rc-utils.h
index 841e026..84f035b 100644
--- a/src/include/s6-rc/s6rc-utils.h
+++ b/src/include/s6-rc/s6rc-utils.h
@@ -4,6 +4,7 @@
 #define S6RC_UTILS_H
 
 #include <sys/types.h>
+#include <stdint.h>
 
 #include <skalibs/stralloc.h>
 
@@ -19,4 +20,7 @@ extern ssize_t s6rc_livedir_prefix (char const *, char *, size_t) ;
 extern int s6rc_livedir_create (stralloc *, char const *, char const *, char const *, char const *, char const *, unsigned char const *, unsigned int, size_t *) ;
 extern int s6rc_livedir_canon (char const **) ;
 
+extern int s6rc_live_state_size (char const *, uint32_t *, uint32_t *) ;
+extern int s6rc_live_state_read (char const *, unsigned char *, uint32_t) ;
+
 #endif
diff --git a/src/libs6rc/deps-lib/s6rc b/src/libs6rc/deps-lib/s6rc
index 5dbb4de..3b0bf75 100644
--- a/src/libs6rc/deps-lib/s6rc
+++ b/src/libs6rc/deps-lib/s6rc
@@ -5,6 +5,8 @@ s6rc_db_read.o
 s6rc_db_read_sizes.o
 s6rc_db_read_uint32.o
 s6rc_graph_closure.o
+s6rc_live_state_size.o
+s6rc_live_state_read.o
 s6rc_livedir_canon.o
 s6rc_livedir_create.o
 s6rc_livedir_prefix.o
diff --git a/src/libs6rc/s6rc_live_state_read.c b/src/libs6rc/s6rc_live_state_read.c
new file mode 100644
index 0000000..592d08b
--- /dev/null
+++ b/src/libs6rc/s6rc_live_state_read.c
@@ -0,0 +1,23 @@
+/* ISC license. */
+
+#include <stdint.h>
+#include <string.h>
+#include <errno.h>
+
+#include <skalibs/djbunix.h>
+
+#include <s6-rc/s6rc-db.h>
+#include <s6-rc/s6rc-utils.h>
+
+int s6rc_live_state_read (char const *live, unsigned char *state, uint32_t n)
+{
+  size_t livelen = strlen(live) ;
+  char fn[livelen + 7] ;
+  memcpy(fn, live, livelen) ;
+  memcpy(fn + livelen, "/state", n) ;
+  ssize_t r = openreadnclose(fn, (char *)state, n) ;
+  if (r == -1) return 0 ;
+  if (r < n) return (errno = EINVAL, 0) ;
+  for (uint32_t i = 0 ; i < n ; i++) state[i] &= 1 ;
+  return 1 ;
+}
diff --git a/src/libs6rc/s6rc_live_state_size.c b/src/libs6rc/s6rc_live_state_size.c
new file mode 100644
index 0000000..3dd8b67
--- /dev/null
+++ b/src/libs6rc/s6rc_live_state_size.c
@@ -0,0 +1,30 @@
+/* ISC license. */
+
+#include <stdint.h>
+#include <string.h>
+
+#include <skalibs/djbunix.h>
+
+#include <s6-rc/s6rc-db.h>
+#include <s6-rc/s6rc-utils.h>
+
+int s6rc_live_state_size (char const *live, uint32_t *nlong, uint32_t *nshort)
+{
+  s6rc_db_t db ;
+  int fd ;
+  size_t livelen = strlen(live) ;
+  char fn[livelen + 10] ;
+  memcpy(fn, live, livelen) ;
+  memcpy(fn + livelen, "/compiled", 10) ;
+  fd = openc_readb(fn) ;
+  if (fd == -1) return 0 ;
+  if (!s6rc_db_read_sizes(fd, &db))
+  {
+    fd_close(fd) ;
+    return 0 ;
+  }
+  fd_close(fd) ;
+  *nlong = db.nlong ;
+  *nshort = db.nshort ;
+  return 1 ;
+}