smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #320 from kiwix/path_win 

Fix launching command with path containing spaces.
This commit is contained in:
Matthieu Gautier 2020-02-07 13:15:24 +01:00 committed by GitHub
parent 6dd6a5dd80 1632e9c55b
commit bd74ebed1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/subprocess_windows.cpp
View File

@ -4,6 +4,7 @@
#include <windows.h> #include <windows.h>
#include <winbase.h> #include <winbase.h>
#include <shlwapi.h>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
@ -34,11 +35,11 @@ DWORD WINAPI WinImpl::waitForPID(void* _self)
return 0; return 0;
} }
std::unique_ptr<wchar_t[]> toWideChar(const std::string& value) std::unique_ptr<wchar_t[]> toWideChar(const std::string& value, size_t min_size = 0)
{ {
auto size = MultiByteToWideChar(CP_UTF8, 0, size_t size = MultiByteToWideChar(CP_UTF8, 0,
value.c_str(), -1, nullptr, 0); value.c_str(), -1, nullptr, 0);
auto wdata = std::unique_ptr<wchar_t[]>(new wchar_t[size]); auto wdata = std::unique_ptr<wchar_t[]>(new wchar_t[size>min_size?size:min_size]);
auto ret = MultiByteToWideChar(CP_UTF8, 0, auto ret = MultiByteToWideChar(CP_UTF8, 0,
value.c_str(), -1, wdata.get(), size); value.c_str(), -1, wdata.get(), size);
if (0 == ret) { if (0 == ret) {
@ -46,6 +47,9 @@ std::unique_ptr<wchar_t[]> toWideChar(const std::string& value)
oss << "Cannot convert to wchar : " << GetLastError(); oss << "Cannot convert to wchar : " << GetLastError();
throw std::runtime_error(oss.str()); throw std::runtime_error(oss.str());
} }
if (size < min_size) {
memset(wdata.get() + size, 0, min_size-size);
}
return wdata; return wdata;
} }
@ -55,14 +59,16 @@ void WinImpl::run(commandLine_t& commandLine)
STARTUPINFOW startInfo = {0}; STARTUPINFOW startInfo = {0};
PROCESS_INFORMATION procInfo; PROCESS_INFORMATION procInfo;
startInfo.cb = sizeof(startInfo); startInfo.cb = sizeof(startInfo);
std::ostringstream oss; std::wostringstream oss;
for(auto& item: commandLine) { for(auto& item: commandLine) {
oss << item << " "; auto witem = toWideChar(item, MAX_PATH);
PathQuoteSpacesW(witem.get());
oss << witem.get() << " ";
} }
auto wCommandLine = toWideChar(oss.str()); auto wCommandLine = oss.str();
if (CreateProcessW( if (CreateProcessW(
NULL, NULL,
wCommandLine.get(), const_cast<wchar_t*>(wCommandLine.c_str()),
NULL, NULL,
NULL, NULL,
false, false,
@ -70,7 +76,8 @@ void WinImpl::run(commandLine_t& commandLine)
NULL, NULL,
NULL, NULL,
&startInfo, &startInfo,
&procInfo)) { &procInfo))
{
m_pid = procInfo.dwProcessId; m_pid = procInfo.dwProcessId;
m_handle = procInfo.hProcess; m_handle = procInfo.hProcess;
CloseHandle(procInfo.hThread); CloseHandle(procInfo.hThread);