From 8f0980665c368c06adb46a1fddb6790e945c7c51 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Fri, 8 Sep 2023 08:06:34 +0000 Subject: child_spawn_workaround is public now Signed-off-by: Laurent Bercot --- src/conn-tools/s6-ipcserverd.c | 2 +- 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 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 #include -#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 ; -- cgit v1.2.3