diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2017-08-28 13:59:16 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2017-08-28 13:59:16 +0000 |
| commit | 04b699857c141a93fc981b83ba02b452ce3a2ddc (patch) | |
| tree | f22701124126003ef8f3bca685c94b0de0cd9dec /src/supervision | |
| parent | a4deb6285e4a3d4aa10fe1913e0be400ec4be25e (diff) | |
| download | s6-04b699857c141a93fc981b83ba02b452ce3a2ddc.tar.xz | |
Switch to xpathexec_*
Diffstat (limited to 'src/supervision')
| -rw-r--r-- | src/supervision/s6-svc.c | 3 | ||||
| -rw-r--r-- | src/supervision/s6-svscan.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/supervision/s6-svc.c b/src/supervision/s6-svc.c index df744e3..12a351e 100644 --- a/src/supervision/s6-svc.c +++ b/src/supervision/s6-svc.c @@ -103,8 +103,7 @@ int main (int argc, char const *const *argv, char const *const *envp) newargv[m++] = "--" ; newargv[m++] = argv[0] ; newargv[m++] = 0 ; - pathexec_run(newargv[0], newargv, envp) ; - strerr_dieexec(111, newargv[0]) ; + xpathexec_run(newargv[0], newargv, envp) ; } else { diff --git a/src/supervision/s6-svscan.c b/src/supervision/s6-svscan.c index 690a068..497970e 100644 --- a/src/supervision/s6-svscan.c +++ b/src/supervision/s6-svscan.c @@ -296,8 +296,7 @@ static void trystart (unsigned int i, char const *name, int islog) if (services[i].flaglog) if (fd_move(!islog, services[i].p[!islog]) == -1) strerr_diefu2sys(111, "set fds for ", name) ; - pathexec_run(S6_BINPREFIX "s6-supervise", cargv, (char const **)environ) ; - strerr_dieexec(111, S6_BINPREFIX "s6-supervise") ; + xpathexec_run(S6_BINPREFIX "s6-supervise", cargv, (char const **)environ) ; } } services[i].pid[islog] = pid ; |