TheCloud/cpp-subprocess
1
0
Fork 0
mirror of https://github.com/arun11299/cpp-subprocess.git synced 2025-08-04 20:36:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Support cwd on Windows (#108)

Browse Source 
This requires making cwd arg be either narrow or
wide char depending on platform and plumbing the
argument to CreateProcessW. Since `env_char_t` and
`env_str_t` is now being used beyond just env,
I've renamed those types to `platform_char_t` and
`platform_str_t`. `env_char_t` and `env_str_t` are
provided as alias to the new name for backwards
compatibility.
This commit is contained in:
Haowen Liu 2025-04-22 08:01:03 -04:00 committed by GitHub
parent 3afe581c1f
commit beda7b5244
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
subprocess.hpp
View File

@ -156,14 +156,16 @@ public:
//Environment Variable types //Environment Variable types
#ifndef _MSC_VER #ifndef _MSC_VER
using env_string_t = std::string; using platform_str_t = std::string;
using env_char_t = char; using platform_char_t = char;
#else #else
using env_string_t = std::wstring; using platform_str_t = std::wstring;
using env_char_t = wchar_t; using platform_char_t = wchar_t;
#endif #endif
using env_map_t = std::map<env_string_t, env_string_t>; using env_str_t = platform_str_t;
using env_vector_t = std::vector<env_char_t>; using env_char_t = platform_char_t;
using env_map_t = std::map<platform_str_t, platform_str_t>;
using env_vector_t = std::vector<platform_char_t>;
//-------------------------------------------------------------------- //--------------------------------------------------------------------
namespace util namespace util
@ -333,14 +335,14 @@ namespace util
while (*variable_strings_ptr) while (*variable_strings_ptr)
{ {
// Create a string from Variable String // Create a string from Variable String
env_string_t current_line(variable_strings_ptr); platform_str_t current_line(variable_strings_ptr);
// Find the first "equals" sign. // Find the first "equals" sign.
auto pos = current_line.find(delimeter); auto pos = current_line.find(delimeter);
// Assuming it's not missing ... // Assuming it's not missing ...
if(pos!=std::wstring::npos){ if(pos!=std::wstring::npos){
// ... parse the key and value. // ... parse the key and value.
env_string_t key = current_line.substr(0, pos); platform_str_t key = current_line.substr(0, pos);
env_string_t value = current_line.substr(pos + del_len); platform_str_t value = current_line.substr(pos + del_len);
// Map the entry. // Map the entry.
mapped_environment[key] = value; mapped_environment[key] = value;
} }
@ -368,7 +370,7 @@ namespace util
// And fill'er up. // And fill'er up.
for(auto kv: source_map){ for(auto kv: source_map){
// Create the line // Create the line
env_string_t current_line(kv.first); current_line += L"="; current_line += kv.second; platform_str_t current_line(kv.first); current_line += L"="; current_line += kv.second;
// Add the line to the buffer. // Add the line to the buffer.
std::copy(current_line.begin(), current_line.end(), std::back_inserter(environment_map_buffer)); std::copy(current_line.begin(), current_line.end(), std::back_inserter(environment_map_buffer));
// Append a null // Append a null
@ -730,10 +732,11 @@ struct executable: string_arg
* *
* Eg: cwd{"/som/path/x"} * Eg: cwd{"/som/path/x"}
*/ */
struct cwd: string_arg struct cwd
{ {
template <typename T> explicit cwd(const platform_str_t &cwd): cwd_(cwd) {}
cwd(T&& arg): string_arg(std::forward<T>(arg)) {} explicit cwd(platform_str_t &&cwd): cwd_(std::move(cwd)) {}
platform_str_t cwd_;
}; };
/*! /*!
@ -1352,7 +1355,7 @@ private:
bool session_leader_ = false; bool session_leader_ = false;
std::string exe_name_; std::string exe_name_;
std::string cwd_; platform_str_t cwd_;
env_map_t env_; env_map_t env_;
preexec_func preexec_fn_; preexec_func preexec_fn_;
@ -1540,6 +1543,8 @@ inline void Popen::execute_process() noexcept(false)
siStartInfo.dwFlags |= STARTF_USESTDHANDLES; siStartInfo.dwFlags |= STARTF_USESTDHANDLES;
const wchar_t *cwd_arg = this->cwd_.empty() ? NULL : cwd_.c_str();
// Create the child process. // Create the child process.
bSuccess = CreateProcessW(NULL, bSuccess = CreateProcessW(NULL,
szCmdline, // command line szCmdline, // command line
@ -1548,7 +1553,7 @@ inline void Popen::execute_process() noexcept(false)
TRUE, // handles are inherited TRUE, // handles are inherited
creation_flags, // creation flags creation_flags, // creation flags
environment_string_table_ptr, // use provided environment environment_string_table_ptr, // use provided environment
NULL, // use parent's current directory cwd_arg, // use provided current directory
&siStartInfo, // STARTUPINFOW pointer &siStartInfo, // STARTUPINFOW pointer
&piProcInfo); // receives PROCESS_INFORMATION &piProcInfo); // receives PROCESS_INFORMATION
@ -1663,7 +1668,7 @@ namespace detail {
} }
inline void ArgumentDeducer::set_option(cwd&& cwdir) { inline void ArgumentDeducer::set_option(cwd&& cwdir) {
popen_->cwd_ = std::move(cwdir.arg_value); popen_->cwd_ = std::move(cwdir.cwd_);
} }
inline void ArgumentDeducer::set_option(bufsize&& bsiz) { inline void ArgumentDeducer::set_option(bufsize&& bsiz) {