1 files changed, 38 insertions, 26 deletions

diff --git a/src/fdholder/s6-fdholder-list.c b/src/fdholder/s6-fdholder-list.c
index ffda680..d6981d0 100644
--- a/src/fdholder/s6-fdholder-list.c
+++ b/src/fdholder/s6-fdholder-list.c
@@ -1,51 +1,63 @@
 /* ISC license. */
 
+#include <string.h>
 #include <skalibs/types.h>
-#include <skalibs/sgetopt.h>
+#include <skalibs/buffer.h>
 #include <skalibs/strerr2.h>
-#include <skalibs/djbunix.h>
-#include <s6/config.h>
+#include <skalibs/sgetopt.h>
+#include <skalibs/tai.h>
+#include <skalibs/stralloc.h>
+#include <skalibs/skamisc.h>
+#include <s6/s6-fdholder.h>
 
-#define USAGE "s6-fdholder-list [ -t timeout ] [ -T ] socket"
+#define USAGE "s6-fdholder-list [ -t timeout ] socket"
 #define dieusage() strerr_dieusage(100, USAGE)
 
-int main (int argc, char const *const *argv, char const *const *envp)
+int main (int argc, char const *const *argv)
 {
-  char const *newargv[9] ;
-  unsigned int m = 0 ;
-  unsigned int timeout = 0 ;
-  int printexpire = 0 ;
-  char fmtt[UINT_FMT] ;
+  s6_fdholder_t a = S6_FDHOLDER_ZERO ;
+  stralloc sa = STRALLOC_ZERO, sb = STRALLOC_ZERO ;
+  size_t pos = 0 ;
+  int n ;
+  tain_t deadline ;
   PROG = "s6-fdholder-list" ;
   {
+    unsigned int t = 0 ;
     subgetopt_t l = SUBGETOPT_ZERO ;
     for (;;)
     {
-      int opt = subgetopt_r(argc, argv, "d:t:T:", &l) ;
+      int opt = subgetopt_r(argc, argv, "t:", &l) ;
       if (opt == -1) break ;
       switch (opt)
       {
-        case 'T' : printexpire = 1 ; break ;
-        case 't' : if (!uint0_scan(l.arg, &timeout)) dieusage() ; break ;
+        case 't' : if (!uint0_scan(l.arg, &t)) dieusage() ; break ;
         default : dieusage() ;
       }
     }
     argc -= l.ind ; argv += l.ind ;
+    if (t) tain_from_millisecs(&deadline, t) ;
+    else deadline = tain_infinite_relative ;
   }
-  if (!argc) dieusage() ;
 
-  newargv[m++] = S6_BINPREFIX "s6-ipcclient" ;
-  newargv[m++] = "-l0" ;
-  newargv[m++] = "--" ;
-  newargv[m++] = argv[0] ;
-  newargv[m++] = S6_BINPREFIX "s6-fdholder-listc" ;
-  if (printexpire) newargv[m++] = "-T" ;
-  if (timeout)
+  if (!argc) dieusage() ;
+  tain_now_g() ;
+  tain_add_g(&deadline, &deadline) ;
+  if (!s6_fdholder_start_g(&a, argv[0], &deadline))
+    strerr_diefu2sys(111, "connect to a fd-holder daemon at ", argv[0]) ;
+  n = s6_fdholder_list_g(&a, &sa, &deadline) ;
+  if (n < 0) strerr_diefu1sys(1, "get fd list") ;
+  while (n--)
   {
-    fmtt[uint_fmt(fmtt, timeout)] = 0 ;
-    newargv[m++] = "-t" ;
-    newargv[m++] = fmtt ;
+    size_t len = strlen(sa.s + pos) ;
+    sb.len = 0 ;
+    if (!string_quote_nodelim_mustquote(&sb, sa.s + pos, len, 0, 0))
+      strerr_diefu1sys(111, "quote string") ;
+    if (buffer_put(buffer_1, sb.s, sb.len) < sb.len || buffer_put(buffer_1, "\n", 1) < 1)
+      strerr_diefu1sys(111, "buffer_put") ;
+    pos += len+1 ;
   }
-  newargv[m++] = 0 ;
-  xpathexec_run(newargv[0], newargv, envp) ;
+  stralloc_free(&sb) ;
+  stralloc_free(&sa) ;
+  if (!buffer_flush(buffer_1)) strerr_diefu1sys(111, "write to stdout") ;
+  return 0 ;
 }