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

ENH: Remove extra windows newline characters from process output. Centralized text fix processing.

This commit is contained in:
Brad King 2006-02-10 11:46:34 -05:00
parent 976ab27ffd
commit 4646929df4
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Source/cmExecuteProcessCommand.cxx
View File

@ -19,6 +19,8 @@
#include <cmsys/Process.h> #include <cmsys/Process.h>
void cmExecuteProcessCommandFixText(std::vector<char>& output);
// cmExecuteProcessCommand // cmExecuteProcessCommand
bool cmExecuteProcessCommand::InitialPass(std::vector<std::string> const& args) bool cmExecuteProcessCommand::InitialPass(std::vector<std::string> const& args)
{ {
@ -254,15 +256,6 @@ bool cmExecuteProcessCommand::InitialPass(std::vector<std::string> const& args)
int p; int p;
while((p = cmsysProcess_WaitForData(cp, &data, &length, 0), p)) while((p = cmsysProcess_WaitForData(cp, &data, &length, 0), p))
{ {
// Translate NULL characters in the output into valid text.
for(int i=0; i < length; ++i)
{
if(data[i] == '\0')
{
data[i] = ' ';
}
}
// Put the output in the right place. // Put the output in the right place.
if(p == cmsysProcess_Pipe_STDOUT && !output_quiet || if(p == cmsysProcess_Pipe_STDOUT && !output_quiet ||
p == cmsysProcess_Pipe_STDERR && !error_quiet && merge_output) p == cmsysProcess_Pipe_STDERR && !error_quiet && merge_output)
@ -288,15 +281,17 @@ bool cmExecuteProcessCommand::InitialPass(std::vector<std::string> const& args)
// All output has been read. Wait for the process to exit. // All output has been read. Wait for the process to exit.
cmsysProcess_WaitForExit(cp, 0); cmsysProcess_WaitForExit(cp, 0);
// Fix the text in the output strings.
cmExecuteProcessCommandFixText(tempOutput);
cmExecuteProcessCommandFixText(tempError);
// Store the output obtained. // Store the output obtained.
if(!output_variable.empty()) if(!output_variable.empty())
{ {
tempOutput.push_back('\0');
m_Makefile->AddDefinition(output_variable.c_str(), &*tempOutput.begin()); m_Makefile->AddDefinition(output_variable.c_str(), &*tempOutput.begin());
} }
if(!merge_output && !error_variable.empty()) if(!merge_output && !error_variable.empty())
{ {
tempError.push_back('\0');
m_Makefile->AddDefinition(error_variable.c_str(), &*tempError.begin()); m_Makefile->AddDefinition(error_variable.c_str(), &*tempError.begin());
} }
@ -333,3 +328,24 @@ bool cmExecuteProcessCommand::InitialPass(std::vector<std::string> const& args)
return true; return true;
} }
//----------------------------------------------------------------------------
void cmExecuteProcessCommandFixText(std::vector<char>& output)
{
// Remove \0 characters and the \r part of \r\n pairs.
unsigned int in_index = 0;
unsigned int out_index = 0;
while(in_index < output.size())
{
char c = output[in_index++];
if((c != '\r' || !(in_index < output.size() && output[in_index] == '\n'))
&& c != '\0')
{
output[out_index++] = c;
}
}
output.resize(out_index);
// Put a terminator on the text string.
output.push_back('\0');
}