From 673daedab4a8eb3660867b8de99d75c892a987b8 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Sun, 29 Nov 2020 19:40:51 +0000
Subject:  Adapt to new skalibs/exec.h

---
 src/minutils/s6-chroot.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/minutils/s6-chroot.c')

diff --git a/src/minutils/s6-chroot.c b/src/minutils/s6-chroot.c
index 83a79b7..036c20f 100644
--- a/src/minutils/s6-chroot.c
+++ b/src/minutils/s6-chroot.c
@@ -1,20 +1,18 @@
 /* ISC license. */
 
-#ifndef _BSD_SOURCE
-#define _BSD_SOURCE
-#endif
-
+#include <skalibs/nonposix.h>
 #include <unistd.h>
+
 #include <skalibs/strerr2.h>
-#include <skalibs/djbunix.h>
+#include <skalibs/exec.h>
 
 #define USAGE "s6-chroot dir prog..."
 
-int main (int argc, char const *const *argv, char const *const *envp)
+int main (int argc, char const *const *argv)
 {
   PROG = "s6-chroot" ;
   if (argc < 3) strerr_dieusage(100, USAGE) ;
   if (chdir(argv[1]) == -1) strerr_diefu2sys(111, "chdir to ", argv[1]) ;
   if (chroot(".") == -1) strerr_diefu2sys(111, "chroot in ", argv[1]) ;
-  xpathexec_run(argv[2], argv+2, envp) ;
+  xexec(argv+2) ;
 }
-- 
cgit v1.2.3