boost/process
2
0
Fork 0
mirror of https://github.com/boostorg/process.git synced 2026-01-19 04:22:15 +00:00
Code Issues Projects Releases Wiki Activity

Reworked arg handling on windows (v2)

Browse Source
This commit is contained in:
Klemens Morgenstern
2025-10-21 12:15:06 +08:00
committed by Klemens Morgenstern
parent aa40c138ed
commit 60affa362c
2 changed files with 25 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/windows/default_launcher.cpp
View File

@@ -24,30 +24,24 @@ namespace windows
if (ws.empty())
return 2u; // just quotes
constexpr static auto space = L' ';
constexpr static auto quote = L'"';
const auto has_space = ws.find(space) != basic_string_view<wchar_t>::npos;
const auto quoted = (ws.front() == quote) && (ws.back() == quote);
const auto has_inner_quote = std::find(std::next(ws.begin()), std::prev(ws.end()), quote) != std::prev(ws.end());
const auto needs_escape = (has_space && !quoted) || has_inner_quote;
if (!needs_escape)
return ws.size();
else
return ws.size() + std::count(ws.begin(), ws.end(), quote) + (quoted ? 2u : 0u);
const auto needs_quotes = ws.find_first_of(L" \t") != basic_string_view<wchar_t>::npos;
return ws.size() + std::count(ws.begin(), ws.end(), quote) + (needs_quotes ? 2u : 0u);
}
std::size_t default_launcher::escape_argv_string(wchar_t * itr, std::size_t max_size,
basic_string_view<wchar_t> ws)
{
constexpr static auto space = L' ';
constexpr static auto quote = L'"';
const auto sz = escaped_argv_length(ws);
const auto needs_quotes = ws.find_first_of(L" \t") != basic_string_view<wchar_t>::npos;
const auto needed_escapes = std::count(ws.begin(), ws.end(), quote);
const auto sz = ws.size() + needed_escapes + (needs_quotes ? 2u : 0u);
if (sz > max_size)
return 0u;
if (ws.empty())
{
itr[0] = quote;
@@ -55,23 +49,9 @@ namespace windows
return 2u;
}
const auto has_space = ws.find(space) != basic_string_view<wchar_t>::npos;
const auto quoted = (ws.front() == quote) && (ws.back() == quote);
const auto has_inner_quote = std::find(std::next(ws.begin()), std::prev(ws.end()), quote) != std::prev(ws.end());
const auto needs_escape = (has_space && !quoted) || has_inner_quotes;
if (!needs_escape)
return std::copy(ws.begin(), ws.end(), itr) - itr;
if (sz < (2u + ws.size()))
return 0u;
const auto end = itr + sz;
const auto begin = itr;
if (!quoted)
if (needs_quotes)
*(itr++) = quote;
for (auto wc : ws)
@@ -80,7 +60,8 @@ namespace windows
*(itr++) = L'\\';
*(itr++) = wc;
}
if (!quoted)
if (needs_quotes)
*(itr++) = quote;
return itr - begin;
}

15
test/v2/process.cpp
View File

@@ -257,7 +257,7 @@ BOOST_AUTO_TEST_CASE(print_args_spec_out)
asio::connect_pipe(rp, wp);
bpv::process proc(ctx, pth, {"print-args", "&foo", "&", "|bar", "\"", "#foobar"}, bpv::process_stdio{/*in*/{},/*out*/wp, /*err*/ nullptr});
bpv::process proc(ctx, pth, {"print-args", "&foo", "&", "", "\"\"", "\\\"", "|bar", "\"", "#foobar"}, bpv::process_stdio{/*in*/{},/*out*/wp, /*err*/ nullptr});
wp.close();
asio::streambuf st;
@@ -288,6 +288,18 @@ BOOST_AUTO_TEST_CASE(print_args_spec_out)
trim_end(line);
BOOST_CHECK_EQUAL("&", line);
BOOST_CHECK(std::getline(is, line));
trim_end(line);
BOOST_CHECK_EQUAL("", line);
BOOST_CHECK(std::getline(is, line));
trim_end(line);
BOOST_CHECK_EQUAL("\"\"", line);
BOOST_CHECK(std::getline(is, line));
trim_end(line);
BOOST_CHECK_EQUAL("\\\"", line);
BOOST_CHECK(std::getline(is, line));
trim_end(line);
BOOST_CHECK_EQUAL("|bar", line);
@@ -296,6 +308,7 @@ BOOST_AUTO_TEST_CASE(print_args_spec_out)
trim_end(line);
BOOST_CHECK_EQUAL("\"", line);
BOOST_CHECK(std::getline(is, line));
trim_end(line);
BOOST_CHECK_EQUAL("#foobar", line);