From 07f242ee318bbdb0badb48331d38edeac271a63d Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Tue, 22 Aug 2017 15:52:26 +0000 Subject: Convert to xpathexec --- src/minutils/s6-chroot.c | 3 +-- src/minutils/s6-devd.c | 3 +-- src/minutils/s6-pivotchroot.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/minutils/s6-chroot.c b/src/minutils/s6-chroot.c index 654ee8f..83a79b7 100644 --- a/src/minutils/s6-chroot.c +++ b/src/minutils/s6-chroot.c @@ -16,6 +16,5 @@ int main (int argc, char const *const *argv, char const *const *envp) 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]) ; - pathexec_run(argv[2], argv+2, envp) ; - strerr_dieexec(111, argv[2]) ; + xpathexec_run(argv[2], argv+2, envp) ; } diff --git a/src/minutils/s6-devd.c b/src/minutils/s6-devd.c index 7122e13..f3b0932 100644 --- a/src/minutils/s6-devd.c +++ b/src/minutils/s6-devd.c @@ -98,7 +98,6 @@ int main (int argc, char const *const *argv, char const *const *envp) fmtk[uint_fmt(fmtk, kbufsz)] = 0 ; } pargv[m++] = 0 ; - pathexec_run(pargv[0], pargv, envp) ; - strerr_dieexec(111, pargv[0]) ; + xpathexec_run(pargv[0], pargv, envp) ; } } diff --git a/src/minutils/s6-pivotchroot.c b/src/minutils/s6-pivotchroot.c index ee4db73..3a7a470 100644 --- a/src/minutils/s6-pivotchroot.c +++ b/src/minutils/s6-pivotchroot.c @@ -19,6 +19,5 @@ int main (int argc, char const *const *argv, char const *const *envp) 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") ; - pathexec_run(argv[3], argv+3, envp) ; - strerr_dieexec(111, argv[3]) ; + xpathexec_run(argv[3], argv+3, envp) ; } -- cgit v1.2.3