- 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, 54 insertions, 1 deletions

diff --git a/src/supervision/s6-svscanctl.c b/src/supervision/s6-svscanctl.c
index 48e6420..6529e9c 100644
--- a/src/supervision/s6-svscanctl.c
+++ b/src/supervision/s6-svscanctl.c
@@ -1,12 +1,65 @@
 /* ISC license. */
 
+#include <skalibs/bytestr.h>
+#include <skalibs/sgetopt.h>
 #include <skalibs/strerr2.h>
 #include <s6/s6-supervise.h>
 
 #define USAGE "s6-svscanctl [ -phratszbnNiq0678 ] svscandir"
+#define dieusage() strerr_dieusage(100, USAGE)
+
+#define DATASIZE 64
 
 int main (int argc, char const *const *argv)
 {
+  char data[DATASIZE] ;
+  unsigned int datalen = 0 ;
+  int r ;
   PROG = "s6-svscanctl" ;
-  return s6_svc_main(argc, argv, "phratszbnNiq0678", USAGE, ".s6-svscan") ;
+  {
+    subgetopt_t l = SUBGETOPT_ZERO ;
+    for (;;)
+    {
+      register int opt = subgetopt_r(argc, argv, "phratszbnNiq0678", &l) ;
+      if (opt == -1) break ;
+      switch (opt)
+      {
+        case 'p' :
+        case 'h' :
+        case 'r' :
+        case 'a' :
+        case 't' :
+        case 's' :
+        case 'z' :
+        case 'b' :
+        case 'n' :
+        case 'N' :
+        case 'i' :
+        case 'q' :
+        case '0' :
+        case '6' :
+        case '7' :
+        case '8' :
+        {
+          if (datalen >= DATASIZE) strerr_dief1x(100, "too many commands") ;
+          data[datalen++] = opt ;
+          break ;
+        }
+        default : dieusage() ;
+      }
+    }
+    argc -= l.ind ; argv += l.ind ;
+  }
+  if (!argc) dieusage() ;
+
+  {
+    unsigned int arglen = str_len(*argv) ;
+    char tmp[arglen + 20] ;
+    byte_copy(tmp, arglen, *argv) ;
+    byte_copy(tmp + arglen, 20, "/.s6-svscan/control") ;
+    r = s6_svc_write(tmp, data, datalen) ;
+  }
+  if (r < 0) strerr_diefu2sys(111, "control ", *argv) ;
+  else if (!r) strerr_diefu3x(100, "control ", *argv, ": supervisor not listening") ;
+  return 0 ;
 }