- 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, 4 insertions, 51 deletions

diff --git a/src/libs6/ftrigw_notifyb.c b/src/libs6/ftrigw_notifyb.c
index 345a3cc..ddd1116 100644
--- a/src/libs6/ftrigw_notifyb.c
+++ b/src/libs6/ftrigw_notifyb.c
@@ -1,67 +1,20 @@
 /* ISC license. */
 
-#include <unistd.h>
 #include <errno.h>
 #include <signal.h>
-#include <skalibs/direntry.h>
-#include <skalibs/allreadwrite.h>
-#include <skalibs/bytestr.h>
 #include <skalibs/sig.h>
-#include <skalibs/djbunix.h>
-#include "ftrig1.h"
 #include <s6/ftrigw.h>
 
 int ftrigw_notifyb (char const *path, char const *s, unsigned int len)
 {
-  unsigned int i = 0 ;
   struct skasigaction old ;
-  DIR *dir = opendir(path) ;
-  if (!dir) return -1 ;
+  int r ;
   if (skasigaction(SIGPIPE, &SKASIG_IGN, &old) < 0) return -1 ;
-  {
-    unsigned int pathlen = str_len(path) ;
-    char tmp[pathlen + FTRIG1_PREFIXLEN + 45] ;
-    byte_copy(tmp, pathlen, path) ;
-    tmp[pathlen] = '/' ; tmp[pathlen + FTRIG1_PREFIXLEN + 44] = 0 ;
-    for (;;)
-    {
-      direntry *d ;
-      int fd ;
-      errno = 0 ;
-      d = readdir(dir) ;
-      if (!d) break ;
-      if (str_diffn(d->d_name, FTRIG1_PREFIX, FTRIG1_PREFIXLEN)) continue ;
-      if (str_len(d->d_name) != FTRIG1_PREFIXLEN + 43) continue ;
-      byte_copy(tmp + pathlen + 1, FTRIG1_PREFIXLEN + 43, d->d_name) ;
-      fd = open_write(tmp) ;
-      if (fd == -1)
-      {
-        if (errno == ENXIO) unlink(tmp) ;
-      }
-      else
-      {
-        register int r = fd_write(fd, s, len) ;
-        if ((r < 0) || (unsigned int)r < len)
-        {
-          if (errno == EPIPE) unlink(tmp) ;
-           /* what to do if EGAIN ? full fifo -> fix the reader !
-              There's a race condition in extreme cases though ;
-              but it's still better to be nonblocking - the writer
-              shouldn't get in trouble because of a bad reader. */
-          fd_close(fd) ;
-        }
-        else
-        {
-          fd_close(fd) ;
-          i++ ;
-        }
-      }
-    }
-  }
+  r = ftrigw_notifyb_nosig(path, s, len) ;
   {
     int e = errno ;
     skasigaction(SIGPIPE, &old, 0) ;
-    dir_close(dir) ;
-    return e ? (errno = e, -1) : (int)i ;
+    errno = e ;
   }
+  return r ;
 }