1 files changed, 16 insertions, 24 deletions

diff --git a/src/fdholder/s6-fdholder-delete.c b/src/fdholder/s6-fdholder-delete.c
index def559f..09d3a2c 100644
--- a/src/fdholder/s6-fdholder-delete.c
+++ b/src/fdholder/s6-fdholder-delete.c
@@ -3,20 +3,19 @@
 #include <skalibs/types.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/strerr2.h>
-#include <skalibs/djbunix.h>
-#include <s6/config.h>
+#include <skalibs/tai.h>
+#include <s6/s6-fdholder.h>
 
 #define USAGE "s6-fdholder-delete [ -t timeout ] socket id"
 #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[10] ;
-  unsigned int timeout = 0 ;
-  unsigned int m = 0 ;
-  char fmtt[UINT_FMT] ;
+  s6_fdholder_t a = S6_FDHOLDER_ZERO ;
+  tain_t deadline ;
   PROG = "s6-fdholder-delete" ;
   {
+    unsigned int t = 0 ;
     subgetopt_t l = SUBGETOPT_ZERO ;
     for (;;)
     {
@@ -24,27 +23,20 @@ int main (int argc, char const *const *argv, char const *const *envp)
       if (opt == -1) break ;
       switch (opt)
       {
-        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 < 2) dieusage() ;
-
-  newargv[m++] = S6_BINPREFIX "s6-ipcclient" ;
-  newargv[m++] = "-l0" ;
-  newargv[m++] = "--" ;
-  newargv[m++] = argv[0] ;
-  newargv[m++] = S6_BINPREFIX "s6-fdholder-deletec" ;
-  if (timeout)
-  {
-    fmtt[uint_fmt(fmtt, timeout)] = 0 ;
-    newargv[m++] = "-t" ;
-    newargv[m++] = fmtt ;
-  }
-  newargv[m++] = "--" ;
-  newargv[m++] = argv[1] ;
-  newargv[m++] = 0 ;
-  xpathexec_run(newargv[0], newargv, envp) ;
+  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]) ;
+  if (!s6_fdholder_delete_g(&a, argv[1], &deadline))
+    strerr_diefu2sys(1, "delete fd for id ", argv[0]) ;
+  return 0 ;
 }