kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmSystemTools: Simplify RunSingleCommand output string construction 

Assign to the result strings instead setting to empty and appending.
The old approach was left from when we directly buffered output in
the strings.
This commit is contained in:
Brad King 2016-01-14 16:11:00 -05:00
parent dc039cc02c
commit ce3b713baa
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/cmSystemTools.cxx
View File

@ -660,14 +660,6 @@ bool cmSystemTools::RunSingleCommand(std::vector<std::string>const& command,
argv.push_back(a->c_str()); argv.push_back(a->c_str());
} }
argv.push_back(0); argv.push_back(0);
if ( captureStdOut )
{
*captureStdOut = "";
}
if (captureStdErr && captureStdErr != captureStdOut)
{
*captureStdErr = "";
}
cmsysProcess* cp = cmsysProcess_New(); cmsysProcess* cp = cmsysProcess_New();
cmsysProcess_SetCommand(cp, &*argv.begin()); cmsysProcess_SetCommand(cp, &*argv.begin());
@ -745,14 +737,13 @@ bool cmSystemTools::RunSingleCommand(std::vector<std::string>const& command,
} }
cmsysProcess_WaitForExit(cp, 0); cmsysProcess_WaitForExit(cp, 0);
if ( captureStdOut && tempStdOut.begin() != tempStdOut.end()) if (captureStdOut)
{ {
captureStdOut->append(&*tempStdOut.begin(), tempStdOut.size()); captureStdOut->assign(tempStdOut.begin(), tempStdOut.end());
} }
if ( captureStdErr && captureStdErr != captureStdOut && if (captureStdErr && captureStdErr != captureStdOut)
tempStdErr.begin() != tempStdErr.end())
{ {
captureStdErr->append(&*tempStdErr.begin(), tempStdErr.size()); captureStdErr->assign(tempStdErr.begin(), tempStdErr.end());
} }
bool result = true; bool result = true;