summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2023-09-08 08:06:34 +0000
committerLaurent Bercot <ska@appnovation.com>2023-09-08 08:06:34 +0000
commit8f0980665c368c06adb46a1fddb6790e945c7c51 (patch)
tree68975f58f2857b86727955c191b0718dba472cba
parent15ebb5b8add8ee6a304981dd604fae78f491b34c (diff)
downloads6-8f0980665c368c06adb46a1fddb6790e945c7c51.tar.xz
child_spawn_workaround is public now
Signed-off-by: Laurent Bercot <ska@appnovation.com>
-rw-r--r--src/conn-tools/s6-ipcserverd.c2
-rw-r--r--src/libs6/s6_ucspiserver_spawn.c4
2 files changed, 1 insertions, 5 deletions
diff --git a/src/conn-tools/s6-ipcserverd.c b/src/conn-tools/s6-ipcserverd.c
index 35afdc5..2987763 100644
--- 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
index 982d754..7fd4116 100644
--- 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 ;