Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

another attempt to fix quoting for cmd.exe on windows

Browse source
This commit is contained in:
Tim Felgentreff 2021-07-17 07:04:29 +02:00
parent 8c709c8f8f
commit 7aae6e1bb3
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gameheaders/stratagus-gameutils.h
View file

@ -243,11 +243,9 @@ void ArgvQuote(const std::wstring& Argument, std::wstring& CommandLine, bool For
int runCommand(std::wstring& file, std::vector<std::wstring> argv, bool echo = false, std::wstring *outputCommandline = NULL) {
std::wstring cmdline;
std::wstring executable;
ArgvQuote(file, cmdline, false);
if (argv.size() > 0) {
cmdline.push_back(L' ');
}
ArgvQuote(file, executable, false);
for (size_t i = 0; i < argv.size(); i++) {
std::wstring arg = argv[i];
@ -263,11 +261,19 @@ int runCommand(std::wstring& file, std::vector<std::wstring> argv, bool echo = f
}
cmdcmdline.push_back(c);
}
if (argv.size() > 0) {
cmdcmdline = std::wstring(L"@") + executable + std::wstring(L" ") + cmdcmdline;
} else {
cmdcmdline = std::wstring(L"@") + executable;
}
if (outputCommandline != NULL) {
outputCommandline->append(cmdline);
outputCommandline->append(cmdcmdline);
}
if (echo) {
std::wcout << cmdline << L'\n';
std::wcout << executable << L' ' << cmdline << L'\n';
std::wcout << cmdcmdline << L'\n';
}
_flushall();
int code = _wsystem(cmdcmdline.c_str());