diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2020-11-28 12:38:56 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2020-11-28 12:38:56 +0000 |
| commit | 1f7a397ea589f31ab8e8eed72ebc2933ddb229a9 (patch) | |
| tree | cb4e418146839514fbca2f805a7a4e4ee3918324 /src/daemontools-extras/s6-envdir.c | |
| parent | bdef68e12278ddfc5080732bd3b28dd5135c9d3a (diff) | |
| download | s6-1f7a397ea589f31ab8e8eed72ebc2933ddb229a9.tar.xz | |
Adapt to new exec.h
Diffstat (limited to 'src/daemontools-extras/s6-envdir.c')
| -rw-r--r-- | src/daemontools-extras/s6-envdir.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/daemontools-extras/s6-envdir.c b/src/daemontools-extras/s6-envdir.c index 140379d..6a6bd6f 100644 --- a/src/daemontools-extras/s6-envdir.c +++ b/src/daemontools-extras/s6-envdir.c @@ -1,15 +1,16 @@ /* ISC license. */ #include <errno.h> + #include <skalibs/sgetopt.h> #include <skalibs/strerr2.h> #include <skalibs/stralloc.h> #include <skalibs/env.h> -#include <skalibs/djbunix.h> +#include <skalibs/exec.h> #define USAGE "s6-envdir [ -I | -i ] [ -n ] [ -f ] [ -c nullchar ] dir prog..." -int main (int argc, char const *const *argv, char const *const *envp) +int main (int argc, char const *const *argv) { stralloc modifs = STRALLOC_ZERO ; subgetopt_t l = SUBGETOPT_ZERO ; @@ -35,5 +36,5 @@ int main (int argc, char const *const *argv, char const *const *envp) if (argc < 2) strerr_dieusage(100, USAGE) ; if ((envdir_internal(*argv++, &modifs, options, nullis) < 0) && (insist || (errno != ENOENT))) strerr_diefu1sys(111, "envdir") ; - xpathexec_r(argv, envp, env_len(envp), modifs.s, modifs.len) ; + xmexec_m(argv, modifs.s, modifs.len) ; } |