diff options
Diffstat (limited to 'src/libexecline/el_substandrun_str.c')
| -rw-r--r-- | src/libexecline/el_substandrun_str.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/libexecline/el_substandrun_str.c b/src/libexecline/el_substandrun_str.c index 351ec9d..8168287 100644 --- a/src/libexecline/el_substandrun_str.c +++ b/src/libexecline/el_substandrun_str.c @@ -1,5 +1,6 @@ /* ISC license. */ +#include <unistd.h> #include <skalibs/djbunix.h> #include <skalibs/env.h> #include <skalibs/strerr2.h> @@ -8,18 +9,18 @@ #include <execline/execline.h> #include "exlsn.h" -void el_substandrun_str (stralloc *src, unsigned int srcbase, char const *const *envp, exlsn_t *info) +void el_substandrun_str (stralloc *src, unsigned int srcbase, char const *const *envp, exlsn_t const *info) { stralloc dst = STRALLOC_ZERO ; - register int r = el_substitute(&dst, src->s + srcbase, src->len, info->vars.s, info->values.s, genalloc_s(elsubst_t, &info->data), genalloc_len(elsubst_t, &info->data)) ; + register int r = el_substitute(&dst, src->s + srcbase, src->len, info->vars.s, info->values.s, genalloc_s(elsubst_t const, &info->data), genalloc_len(elsubst_t const, &info->data)) ; if (r < 0) strerr_diefu1sys(111, "el_substitute") ; - exlsn_free(info) ; + if (!r) _exit(0) ; stralloc_free(src) ; { char const *v[r + 1] ; if (!env_make(v, r, dst.s, dst.len)) strerr_diefu1sys(111, "env_make") ; v[r] = 0 ; - pathexec0_run(v, envp) ; + pathexec_r(v, envp, env_len(envp), info->modifs.s, info->modifs.len) ; } strerr_dieexec(111, dst.s) ; } |