From 1f592173a28907dadfb75132e1eb25dfe4fb3a94 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Sat, 9 Sep 2023 04:35:20 +0000
Subject:  Adapt to skalibs-2.14

Signed-off-by: Laurent Bercot <ska@appnovation.com>
---
 src/pipe-tools/s6-ftrig-listen.c  | 3 ++-
 src/pipe-tools/s6-ftrig-listen1.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/pipe-tools')

diff --git a/src/pipe-tools/s6-ftrig-listen.c b/src/pipe-tools/s6-ftrig-listen.c
index 92e257e..041226e 100644
--- a/src/pipe-tools/s6-ftrig-listen.c
+++ b/src/pipe-tools/s6-ftrig-listen.c
@@ -13,6 +13,7 @@
 #include <skalibs/djbunix.h>
 #include <skalibs/sig.h>
 #include <skalibs/selfpipe.h>
+#include <skalibs/cspawn.h>
 
 #include <s6/compat.h>
 #include <s6/ftrigr.h>
@@ -81,7 +82,7 @@ int main (int argc, char const **argv, char const *const *envp)
       if (!ids[i]) strerr_diefu4sys(111, "subscribe to ", argv[i<<1], " with regexp ", argv[(i<<1)+1]) ;
     }
 
-    pid = child_spawn0(argv[argc1 + 1], argv + argc1 + 1, envp) ;
+    pid = cspawn(argv[argc1 + 1], argv + argc1 + 1, envp, CSPAWN_FLAGS_SELFPIPE_FINISH, 0, 0) ;
     if (!pid) strerr_diefu2sys(111, "spawn ", argv[argc1 + 1]) ;
 
     for (;;)
diff --git a/src/pipe-tools/s6-ftrig-listen1.c b/src/pipe-tools/s6-ftrig-listen1.c
index b81b484..4c42820 100644
--- a/src/pipe-tools/s6-ftrig-listen1.c
+++ b/src/pipe-tools/s6-ftrig-listen1.c
@@ -14,6 +14,7 @@
 #include <skalibs/djbunix.h>
 #include <skalibs/sig.h>
 #include <skalibs/selfpipe.h>
+#include <skalibs/cspawn.h>
 
 #include <s6/ftrigr.h>
 
@@ -69,7 +70,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
   if (!selfpipe_trap(SIGCHLD)) strerr_diefu1sys(111, "selfpipe_trap") ;
   x[1].fd = ftrigr_fd(&a) ;
 
-  pid = child_spawn0(argv[2], argv+2, envp) ;
+  pid = cspawn(argv[2], argv+2, envp, CSPAWN_FLAGS_SELFPIPE_FINISH, 0, 0) ;
   if (!pid) strerr_diefu2sys(111, "spawn ", argv[2]) ;
 
   for (;;)
-- 
cgit v1.3.1