summaryrefslogtreecommitdiff
path: root/src/libexecline
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2017-05-18 13:34:14 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2017-05-18 13:34:14 +0000
commit80e1bb78abff39447d6312d837dd0d8155e63c8a (patch)
treea309f979f773023e7bcaad53e14562981d309bcd /src/libexecline
parenta06c7498c5ad31d78b7ec60cf08f4d3f35debd81 (diff)
downloadexecline-80e1bb78abff39447d6312d837dd0d8155e63c8a.tar.xz
Use xpathexec_* functions
Diffstat (limited to 'src/libexecline')
-rw-r--r--src/libexecline/el_execsequence.c3
-rw-r--r--src/libexecline/el_substandrun_str.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/src/libexecline/el_execsequence.c b/src/libexecline/el_execsequence.c
index 42ef104..5adbe49 100644
--- a/src/libexecline/el_execsequence.c
+++ b/src/libexecline/el_execsequence.c
@@ -18,6 +18,5 @@ void el_execsequence (char const *const *argv1, char const *const *argv2, char c
strerr_diefu2sys(111, "wait for ", argv1[0]) ;
if (!argv2[0]) _exit(0) ;
j += uint_fmt(fmt + j, wait_status(wstat)) ; fmt[j++] = 0 ;
- pathexec_r(argv2, envp, env_len(envp), fmt, j) ;
- strerr_dieexec(111, argv2[0]) ;
+ xpathexec_r(argv2, envp, env_len(envp), fmt, j) ;
}
diff --git a/src/libexecline/el_substandrun_str.c b/src/libexecline/el_substandrun_str.c
index 6680957..3f6b8e3 100644
--- a/src/libexecline/el_substandrun_str.c
+++ b/src/libexecline/el_substandrun_str.c
@@ -20,7 +20,6 @@ void el_substandrun_str (stralloc *src, size_t srcbase, char const *const *envp,
char const *v[r + 1] ;
if (!env_make(v, r, dst.s, dst.len)) strerr_diefu1sys(111, "env_make") ;
v[r] = 0 ;
- pathexec_r(v, envp, env_len(envp), info->modifs.s, info->modifs.len) ;
+ xpathexec_r(v, envp, env_len(envp), info->modifs.s, info->modifs.len) ;
}
- strerr_dieexec(111, dst.s) ;
}