From 1f854ec284c52978028ce8b07d1d34275a33a623 Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Mon, 15 Jul 2019 18:03:50 -0700 Subject: [PATCH] Accept a pwd in resolve_file_redirections_to_fds Conceptually allow multiple of these to run in parallel --- src/exec.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/exec.cpp b/src/exec.cpp index 110856ff1..dd10c5ec3 100644 --- a/src/exec.cpp +++ b/src/exec.cpp @@ -38,6 +38,7 @@ #include "iothread.h" #include "parse_tree.h" #include "parser.h" +#include "path.h" #include "postfork.h" #include "proc.h" #include "reader.h" @@ -192,7 +193,8 @@ static int has_fd(const io_chain_t &d, int fd) { return io_chain_get(d, fd).get( /// position. /// /// \return true on success, false on failure. Returns the output chain and opened_fds by reference. -static bool resolve_file_redirections_to_fds(const io_chain_t &in_chain, io_chain_t *out_chain, +static bool resolve_file_redirections_to_fds(const io_chain_t &in_chain, const wcstring &pwd, + io_chain_t *out_chain, std::vector *out_opened_fds) { ASSERT_IS_MAIN_THREAD(); assert(out_chain != NULL && out_opened_fds != NULL); @@ -223,7 +225,8 @@ static bool resolve_file_redirections_to_fds(const io_chain_t &in_chain, io_chai case io_mode_t::file: { // We have a path-based redireciton. Resolve it to a file. io_file_t *in_file = static_cast(in.get()); - int fd = wopen(in_file->filename, in_file->flags, OPEN_MASK); + int fd = wopen(path_apply_working_directory(in_file->filename, pwd), in_file->flags, + OPEN_MASK); if (fd < 0) { debug(1, FILE_ERROR, in_file->filename.c_str()); wperror(L"open"); @@ -261,7 +264,8 @@ void internal_exec_helper(parser_t &parser, parsed_source_ref_t parsed_source, t io_chain_t morphed_chain; std::vector opened_fds; - if (!resolve_file_redirections_to_fds(ios, &morphed_chain, &opened_fds)) { + if (!resolve_file_redirections_to_fds(ios, parser.vars().get_pwd_slash(), &morphed_chain, + &opened_fds)) { parser.set_last_statuses(statuses_t::just(STATUS_EXEC_FAIL)); return; }