- added the s6_fdholder library to libs6. (Nothing useful yet.)

 - fixed execline invocation in s6-log with slashpackage
 - integrated s6_svc_main.c's functionality into s6-svscanctl and deleted it
 - integrated Olivier Brunel's suggestions for wstat report in supervise/status
 - minor fixes to s6-supervise's status reports
 - separated sigaction calls in ftrigw_notifyb, this spares a few syscalls in s6-supervise
 - updated doc to reflect the changes
 - version bumped to 2.1.0.0 because API breakage (./finish, s6-svstat)

1 files changed, 74 insertions, 0 deletions

diff --git a/src/libs6/s6_fdholder_setdump.c b/src/libs6/s6_fdholder_setdump.c
new file mode 100644
index 0000000..e5825dc
--- /dev/null
+++ b/src/libs6/s6_fdholder_setdump.c
@@ -0,0 +1,74 @@
+ /* ISC license. */
+
+#include <errno.h>
+#include <skalibs/uint32.h>
+#include <skalibs/bytestr.h>
+#include <skalibs/error.h>
+#include <skalibs/tai.h>
+#include <skalibs/siovec.h>
+#include <skalibs/unixmessage.h>
+#include <s6/s6-fdholder.h>
+
+int s6_fdholder_setdump (s6_fdholder_t *a, s6_fdholder_fd_t const *list, unsigned int ntot, tain_t const *deadline, tain_t *stamp)
+{
+  uint32 trips ;
+  if (!ntot) return 1 ;
+  unsigned int i = 0 ;
+  for (; i < ntot ; i++)
+  {
+    unsigned int zpos = byte_chr(list[i].id, S6_FDHOLDER_ID_SIZE + 1, 0) ;
+    if (!zpos || zpos >= S6_FDHOLDER_ID_SIZE + 1) return (errno = EINVAL, 0) ;
+  }
+  {
+    char pack[5] = "!" ;
+    unixmessage_t m = { .s = pack, .len = 5, .fds = 0, .nfds = 0 } ;
+    uint32_pack_big(pack+1, ntot) ;
+    if (!unixmessage_put(&a->connection.out, &m)) return 0 ;
+    if (!unixmessage_sender_timed_flush(&a->connection.out, deadline, stamp)) return 0 ;
+    if (!unixmessage_timed_receive(&a->connection.in, &m, deadline, stamp)) return 0 ;
+    if (!m.len || m.nfds) { unixmessage_drop(&m) ; return (errno = EPROTO, 0) ; }
+    if (m.s[0]) return (errno = m.s[0], 0) ;
+    if (m.len != 5) return (errno = EPROTO, 0) ;
+    uint32_unpack_big(pack + 1, &trips) ;
+    if (trips != 1 + (ntot-1) / UNIXMESSAGE_MAXFDS) return (errno = EPROTO, 0) ;
+  }
+  for (i = 0 ; i < trips ; i++, ntot -= UNIXMESSAGE_MAXFDS)
+  {
+    {
+      unsigned int n = ntot > UNIXMESSAGE_MAXFDS ? UNIXMESSAGE_MAXFDS : ntot ;
+      unsigned int j = 0 ;
+      siovec_t v[1 + (n<<1)] ;
+      int fds[n] ;
+      unixmessage_v_t m = { .v = v, .vlen = 1 + (n<<1), .fds = fds, .nfds = n } ;
+      char pack[n * (TAIN_PACK+1)] ;
+      v[0].s = "." ; v[0].len = 1 ;
+      for (; j < n ; j++, list++, ntot--)
+      {
+        unsigned int len = str_len(list->id) ;
+        v[1 + (j<<1)].s = pack + j * (TAIN_PACK+1) ;
+        v[1 + (j<<1)].len = TAIN_PACK + 1 ;
+        tain_pack(pack + j * (TAIN_PACK+1), &list->limit) ;
+        pack[j * (TAIN_PACK+1) + TAIN_PACK] = (unsigned char)len + 1 ;
+        v[2 + (j<<1)].s = (char *)list->id ;
+        v[2 + (j<<1)].len = len ;
+        fds[j] = list->fd ;
+      }
+      if (!unixmessage_putv(&a->connection.out, &m)) return 0 ;
+    }
+    if (!unixmessage_sender_timed_flush(&a->connection.out, deadline, stamp)) return 0 ;
+    {
+      unixmessage_t m ;
+      if (!unixmessage_timed_receive(&a->connection.in, &m, deadline, stamp)) return 0 ;
+      if (m.len != 1 || m.nfds)
+      {
+        unixmessage_drop(&m) ;
+        return (errno = EPROTO, 0) ;
+      }
+      if (!error_isagain(m.s[0]) && i < trips-1)
+        return errno = m.s[0] ? m.s[0] : EPROTO, 0 ;
+      if (i == trips - 1 && m.s[0])
+        return errno = error_isagain(m.s[0]) ? EPROTO : m.s[0], 0 ;
+    }
+  }
+  return 1 ;
+}