More fixes, ftrigr_string addition, doc update

5 files changed, 7 insertions, 24 deletions

diff --git a/src/libs6/deps-lib/s6 b/src/libs6/deps-lib/s6
index 74a30a7..6590d83 100644
--- a/src/libs6/deps-lib/s6
+++ b/src/libs6/deps-lib/s6
@@ -1,7 +1,6 @@
 ftrigr_ack.o
 ftrigr_end.o
 ftrigr_peek.o
-ftrigr_peek1.o
 ftrigr_release.o
 ftrigr_start.o
 ftrigr_startf.o
diff --git a/src/libs6/ftrigr_peek.c b/src/libs6/ftrigr_peek.c
index 155fce3..5107bae 100644
--- a/src/libs6/ftrigr_peek.c
+++ b/src/libs6/ftrigr_peek.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/uio.h>
 #include <errno.h>
 
 #include <skalibs/genalloc.h>
@@ -8,7 +7,7 @@
 #include <s6/ftrigr.h>
 #include "ftrigr-internal.h"
 
-int ftrigr_peek (ftrigr *a, uint32_t id, struct iovec *v)
+int ftrigr_peek (ftrigr *a, uint32_t id, ftrigr_string *fs)
 {
   ftrigr_data *p = genalloc_s(ftrigr_data, &a->data) + id ;
   switch (p->status)
@@ -16,8 +15,8 @@ int ftrigr_peek (ftrigr *a, uint32_t id, struct iovec *v)
     case EAGAIN : return 0 ;
     case 0 :
     {
-      v->iov_base = p->sa.s ;
-      v->iov_len = p->sa.len ;
+      fs->s = p->sa.s ;
+      fs->len = p->sa.len ;
       return 1 ;
     }
     default: break ;
diff --git a/src/libs6/ftrigr_peek1.c b/src/libs6/ftrigr_peek1.c
deleted file mode 100644
index 81059f7..0000000
--- a/src/libs6/ftrigr_peek1.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* ISC license. */
-
-#include <sys/uio.h>
-
-#include <s6/ftrigr.h>
-
-int ftrigr_peek1 (ftrigr *a, uint32_t id, char *c)
-{
-  struct iovec v ;
-  int r = ftrigr_peek(a, id, &v) ;
-  if (r <= 0) return r ;
-  *c = ((char *)v.iov_base)[v.iov_len - 1] ;
-  return 1 ;
-}
diff --git a/src/libs6/ftrigr_wait_and.c b/src/libs6/ftrigr_wait_and.c
index 24e722f..0619b08 100644
--- a/src/libs6/ftrigr_wait_and.c
+++ b/src/libs6/ftrigr_wait_and.c
@@ -14,8 +14,8 @@ int ftrigr_wait_and (ftrigr *a, uint32_t const *list, unsigned int n, tain const
   {
     for (;;)
     {
-      struct iovec v ;
-      int r = ftrigr_peek(a, list[i], &v) ;
+      ftrigr_string fs ;
+      int r = ftrigr_peek(a, list[i], &fs) ;
       if (r == -1) return -1 ;
       if (r) break ;
       r = iopause_stamp(&x, 1, deadline, stamp) ;
diff --git a/src/libs6/ftrigr_wait_or.c b/src/libs6/ftrigr_wait_or.c
index 0ed41b7..799e2e0 100644
--- a/src/libs6/ftrigr_wait_or.c
+++ b/src/libs6/ftrigr_wait_or.c
@@ -1,13 +1,12 @@
 /* ISC license. */
 
-#include <sys/uio.h>
 #include <errno.h>
 
 #include <skalibs/iopause.h>
 
 #include <s6/ftrigr.h>
 
-int ftrigr_wait_or (ftrigr *a, uint32_t const *list, unsigned int n, struct iovec *v, tain const *deadline, tain *stamp)
+int ftrigr_wait_or (ftrigr *a, uint32_t const *list, unsigned int n, ftrigr_string *fs, tain const *deadline, tain *stamp)
 {
   iopause_fd x = { .fd = ftrigr_fd(a), .events = IOPAUSE_READ } ;
   for (;;)
@@ -15,7 +14,7 @@ int ftrigr_wait_or (ftrigr *a, uint32_t const *list, unsigned int n, struct iove
     int r ;
     for (unsigned int i = 0 ; i < n ; i++)
     {
-      r = ftrigr_peek(a, list[i], v) ;
+      r = ftrigr_peek(a, list[i], fs) ;
       if (r == -1) return -1 ;
       if (r) return i ;
     }