s6

commit 8f0980665c368c06adb46a1fddb6790e945c7c51
parent 15ebb5b8add8ee6a304981dd604fae78f491b34c
Author: Laurent Bercot <ska-skaware@skarnet.org>
Date:   Fri,  8 Sep 2023 08:06:34 +0000

 child_spawn_workaround is public now

Signed-off-by: Laurent Bercot <ska@appnovation.com>

Diffstat:
M
src/conn-tools/s6-ipcserverd.c
 | 
2
+-
M
src/libs6/s6_ucspiserver_spawn.c
 | 
4
----

2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/conn-tools/s6-ipcserverd.c b/src/conn-tools/s6-ipcserverd.c
@@ -276,7 +276,7 @@ static void new_connection (int s, char const *remotepath, char const *const *ar
   pid = s6_ucspiserver_spawn(s, argv, envp, envlen, fmt, m, 5) ;
   if (!pid)
   {
-    if (verbosity) strerr_warnwu1sys("fork") ;
+    if (verbosity) strerr_warnwu2sys("spawn ", argv[0]) ;
     return ;
   }
 
diff --git a/src/libs6/s6_ucspiserver_spawn.c b/src/libs6/s6_ucspiserver_spawn.c
@@ -22,10 +22,6 @@
 #include <skalibs/config.h>
 #include <skalibs/env.h>
 
-#ifdef SKALIBS_HASPOSIXSPAWNEARLYRETURN
-extern pid_t child_spawn_workaround (pid_t, int const *) ;  /* XXX: non-public skalibs function */
-#endif
-
 pid_t s6_ucspiserver_spawn (int fd, char const *const *argv, char const *const *envp, size_t envlen, char const *modifs, size_t modiflen, size_t modifn)
 {
   pid_t pid ;