diff options
Diffstat (limited to 'bbot/utility.txx')
-rw-r--r-- | bbot/utility.txx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/bbot/utility.txx b/bbot/utility.txx index b3d6d53..43d995a 100644 --- a/bbot/utility.txx +++ b/bbot/utility.txx @@ -15,14 +15,13 @@ namespace bbot { // run_*() // - template <typename I, typename O, typename E, typename P, typename... A> + template <typename I, typename O, typename E, typename... A> process run_io_start (tracer& t, I&& in, O&& out, E&& err, - const dir_path& cwd, - const P& p, + const process_env& pe, A&&... args) { try @@ -32,12 +31,12 @@ namespace bbot forward<I> (in), forward<O> (out), forward<E> (err), - butl::process_env (p, cwd), + pe, forward<A> (args)...); } catch (const process_error& e) { - fail << "unable to execute " << p << ": " << e << endf; + fail << "unable to execute " << *pe.path << ": " << e << endf; } } @@ -78,7 +77,6 @@ namespace bbot forward<I> (in), forward<O> (out), forward<E> (err), - dir_path (), p, forward<A> (args)...)); @@ -93,7 +91,6 @@ namespace bbot forward<I> (in), forward<O> (out), forward<E> (err), - dir_path (), p, forward<A> (args)...)); run_io_finish (t, pr, p); |