summaryrefslogtreecommitdiff
path: root/src/minutils
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2020-11-29 19:40:51 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2020-11-29 19:40:51 +0000
commit673daedab4a8eb3660867b8de99d75c892a987b8 (patch)
treeed6e0bf9baf6b68be314107c442141e68c87620d /src/minutils
parent038734a5d2072247a2b6cb07d4a923b54cdf5251 (diff)
downloads6-linux-utils-673daedab4a8eb3660867b8de99d75c892a987b8.tar.xz
Adapt to new skalibs/exec.h
Diffstat (limited to 'src/minutils')
-rw-r--r--src/minutils/s6-chroot.c12
-rw-r--r--src/minutils/s6-pivotchroot.c12
2 files changed, 10 insertions, 14 deletions
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) ;
}
diff --git a/src/minutils/s6-pivotchroot.c b/src/minutils/s6-pivotchroot.c
index 3a7a470..42a248b 100644
--- a/src/minutils/s6-pivotchroot.c
+++ b/src/minutils/s6-pivotchroot.c
@@ -1,23 +1,21 @@
/* 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-pivotchroot old-place-for-new-root new-place-for-old-root prog..."
extern int pivot_root (char const *, char const *) ;
-int main (int argc, char const *const *argv, char const *const *envp)
+int main (int argc, char const *const *argv)
{
PROG = "s6-pivotchroot" ;
if (argc < 4) strerr_dieusage(100, USAGE) ;
if (chdir(argv[1]) < 0) strerr_diefu2sys(111, "chdir to ", argv[1]) ;
if (pivot_root(".", argv[2]) < 0) strerr_diefu1sys(111, "pivot_root") ;
if (chroot(".") < 0) strerr_diefu1sys(111, "chroot") ;
- xpathexec_run(argv[3], argv+3, envp) ;
+ xexec(argv+3) ;
}