Adapt to skalibs-2.14

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

2 files changed, 9 insertions, 102 deletions

diff --git a/src/libs6/s6_ucspiserver_spawn.c b/src/libs6/s6_ucspiserver_spawn.c
index 7fd4116..23f102d 100644
--- a/src/libs6/s6_ucspiserver_spawn.c
+++ b/src/libs6/s6_ucspiserver_spawn.c
@@ -1,112 +1,18 @@
 /* ISC license. */
 
-#include <skalibs/sysdeps.h>
-
-#include <stdint.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <skalibs/uint16.h>
-#include <skalibs/fmtscan.h>
-#include <skalibs/djbunix.h>
+#include <skalibs/env.h>
+#include <skalibs/cspawn.h>
 
 #include <s6/ucspiserver.h>
 
-#ifdef SKALIBS_HASPOSIXSPAWN
-
-#include <errno.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <spawn.h>
-
-#include <skalibs/config.h>
-#include <skalibs/env.h>
-
 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 ;
-  posix_spawn_file_actions_t actions ;
-  posix_spawnattr_t attr ;
-  sigset_t set ;
-  int e ;
-  int nopath = !getenv("PATH") ;
-#ifdef SKALIBS_HASPOSIXSPAWNEARLYRETURN
-  int p[2] ;
-#endif
-  char const *newenvp[envlen + modifn + 1] ;
-
-#ifdef SKALIBS_HASPOSIXSPAWNEARLYRETURN
-  if (pipecoe(p) == -1) return 0 ;
-#endif
-  e = posix_spawnattr_init(&attr) ;
-  if (e) goto err ;
-  sigemptyset(&set) ;
-  e = posix_spawnattr_setsigmask(&attr, &set) ;
-  if (e) goto errattr ;
-  e = posix_spawnattr_setflags(&attr, POSIX_SPAWN_SETSIGMASK) ;
-  if (e) goto errattr ;
-  e = posix_spawn_file_actions_init(&actions) ;
-  if (e) goto errattr ;
-  e = posix_spawn_file_actions_adddup2(&actions, fd, 0) ;
-  if (e) goto erractions ;
-  e = posix_spawn_file_actions_adddup2(&actions, fd, 1) ;
-  if (e) goto erractions ;
-  if (fd > 1)
+  cspawn_fileaction fa[2] =
   {
-    e = posix_spawn_file_actions_addclose(&actions, fd) ;
-    if (e) goto erractions ;
-  }
-
+    [0] = { .type = CSPAWN_FA_MOVE, .x = { .fd2 = { [0] = 0, [1] = fd } } },
+    [1] = { .type = CSPAWN_FA_COPY, .x = { .fd2 = { [0] = 1, [1] = 0 } } }
+  } ;
+  char const *newenvp[envlen + modifn + 1] ;
   env_mergen(newenvp, envlen + modifn + 1, envp, envlen, modifs, modiflen, modifn) ;
-  if (nopath && (setenv("PATH", SKALIBS_DEFAULTPATH, 0) < 0)) { e = errno ; goto erractions ; }
-  e = posix_spawnp(&pid, argv[0], &actions, &attr, (char *const *)argv, (char *const *)newenvp) ;
-  if (nopath) unsetenv("PATH") ;
-  if (e) goto erractions ;
-
-  posix_spawn_file_actions_destroy(&actions) ;
-  posix_spawnattr_destroy(&attr) ;
-#ifdef SKALIBS_HASPOSIXSPAWNEARLYRETURN
-  return child_spawn_workaround(pid, p) ;
-#else
-  return pid ;
-#endif
-
- erractions:
-  posix_spawn_file_actions_destroy(&actions) ;
- errattr:
-  posix_spawnattr_destroy(&attr) ;
- err:
-#ifdef SKALIBS_HASPOSIXSPAWNEARLYRETURN
-  fd_close(p[1]) ;
-  fd_close(p[0]) ;
-#endif
-  errno = e ;
-  return 0 ;
-}
-
-#else
-
-#include <skalibs/strerr.h>
-#include <skalibs/selfpipe.h>
-#include <skalibs/exec.h>
-
-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 = fork() ;
-  if (pid == -1) return 0 ;
-  if (!pid)
-  {
-    size_t proglen = strlen(PROG) ;
-    char newprog[proglen + 9] ;
-    memcpy(newprog, PROG, proglen) ;
-    memcpy(newprog, " (child)", 9) ;
-    PROG = newprog ;
-    if ((fd_move(1, fd) == -1) || (fd_copy(0, 1) == -1))
-      strerr_diefu1sys(111, "move fds") ;
-    selfpipe_finish() ;
-    xmexec_fn(argv, envp, envlen, modifs, modiflen, modifn) ;
-  }
-  return pid ;
+  return cspawn(argv[0], argv, newenvp, CSPAWN_FLAGS_SELFPIPE_FINISH, fa, 2) ;
 }
-
-#endif
diff --git a/src/libs6/s6lockd.c b/src/libs6/s6lockd.c
index e7303af..8cc767a 100644
--- a/src/libs6/s6lockd.c
+++ b/src/libs6/s6lockd.c
@@ -15,6 +15,7 @@
 #include <skalibs/sig.h>
 #include <skalibs/selfpipe.h>
 #include <skalibs/tai.h>
+#include <skalibs/cspawn.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/iopause.h>
 #include <skalibs/textmessage.h>