0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix command line arguments with spaces being broken on Windows

Browse source 
This was a regression from 8d2ae80b32. Since quotes got stripped from cl arguments when they were parsed,
and since the utils::join call expected a space as a delimiter, the arguments would get put together incorrectly.

One possible fix would have been to wrap every argument in quotes, but that could potentially some issues for
certain non-quoted arguments. Instead, we just take the original command line output from the console.
This commit is contained in:
Charles Dang 2017-10-27 08:51:03 +11:00
parent a8f6df50e8
commit f6ec9658dd
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/wesnoth.cpp
View file

@ -895,7 +895,7 @@ static void wesnoth_terminate_handler(int) {
#endif
#if defined(_OPENMP) && _MSC_VER >= 1600
static void restart_process(const std::vector<std::string>& commandline)
static void restart_process()
{
wchar_t process_path[MAX_PATH];
SetLastError(ERROR_SUCCESS);
@ -905,7 +905,7 @@ static void restart_process(const std::vector<std::string>& commandline)
throw std::runtime_error("Failed to retrieve the process path");
}
std::wstring commandline_str = unicode_cast<std::wstring>(utils::join(commandline, " "));
std::wstring commandline_str(GetCommandLineW());
// CreateProcessW is allowed to modify the passed command line.
// Therefore we need to copy it.
wchar_t* commandline_c_str = new wchar_t[commandline_str.length() + 1];
@ -997,8 +997,7 @@ int main(int argc, char** argv)
#elif _MSC_VER >= 1600
if (!getenv("OMP_WAIT_POLICY")) {
_putenv_s("OMP_WAIT_POLICY", "PASSIVE");
args[0] = utils::quote(args[0]);
restart_process(args);
restart_process();
}
#endif
#endif //_OPENMP