summaryrefslogtreecommitdiffstats
path: root/Source/cmExecuteProcessCommand.cxx
diff options
context:
space:
mode:
authorKitware Robot <kwrobot@kitware.com>2016-05-16 14:34:04 (GMT)
committerBrad King <brad.king@kitware.com>2016-05-16 20:05:19 (GMT)
commitd9fd2f5402eeaa345691313658e02b51038f570b (patch)
treedca71b9a7e267f4c6300da3eb770415381726785 /Source/cmExecuteProcessCommand.cxx
parent82df6deaafb36cbbfd450202bb20b320f637751a (diff)
downloadCMake-d9fd2f5402eeaa345691313658e02b51038f570b.zip
CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz
CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.bz2
Revise C++ coding style using clang-format
Run the `Utilities/Scripts/clang-format.bash` script to update all our C++ code to a new style defined by `.clang-format`. Use `clang-format` version 3.8. * If you reached this commit for a line in `git blame`, re-run the blame operation starting at the parent of this commit to see older history for the content. * See the parent commit for instructions to rebase a change across this style transition commit.
Diffstat (limited to 'Source/cmExecuteProcessCommand.cxx')
-rw-r--r--Source/cmExecuteProcessCommand.cxx316
1 files changed, 109 insertions, 207 deletions
diff --git a/Source/cmExecuteProcessCommand.cxx b/Source/cmExecuteProcessCommand.cxx
index a1e5010..575cdc3 100644
--- a/Source/cmExecuteProcessCommand.cxx
+++ b/Source/cmExecuteProcessCommand.cxx
@@ -24,19 +24,18 @@ static bool cmExecuteProcessCommandIsWhitespace(char c)
void cmExecuteProcessCommandFixText(std::vector<char>& output,
bool strip_trailing_whitespace);
-void cmExecuteProcessCommandAppend(std::vector<char>& output,
- const char* data, int length);
+void cmExecuteProcessCommandAppend(std::vector<char>& output, const char* data,
+ int length);
// cmExecuteProcessCommand
-bool cmExecuteProcessCommand
-::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
+bool cmExecuteProcessCommand::InitialPass(std::vector<std::string> const& args,
+ cmExecutionStatus&)
{
- if(args.size() < 1 )
- {
+ if (args.size() < 1) {
this->SetError("called with incorrect number of arguments");
return false;
- }
- std::vector< std::vector<const char*> > cmds;
+ }
+ std::vector<std::vector<const char*> > cmds;
std::string arguments;
bool doing_command = false;
size_t command_index = 0;
@@ -52,246 +51,173 @@ bool cmExecuteProcessCommand
std::string error_variable;
std::string result_variable;
std::string working_directory;
- for(size_t i=0; i < args.size(); ++i)
- {
- if(args[i] == "COMMAND")
- {
+ for (size_t i = 0; i < args.size(); ++i) {
+ if (args[i] == "COMMAND") {
doing_command = true;
command_index = cmds.size();
cmds.push_back(std::vector<const char*>());
- }
- else if(args[i] == "OUTPUT_VARIABLE")
- {
+ } else if (args[i] == "OUTPUT_VARIABLE") {
doing_command = false;
- if(++i < args.size())
- {
+ if (++i < args.size()) {
output_variable = args[i];
- }
- else
- {
+ } else {
this->SetError(" called with no value for OUTPUT_VARIABLE.");
return false;
- }
}
- else if(args[i] == "ERROR_VARIABLE")
- {
+ } else if (args[i] == "ERROR_VARIABLE") {
doing_command = false;
- if(++i < args.size())
- {
+ if (++i < args.size()) {
error_variable = args[i];
- }
- else
- {
+ } else {
this->SetError(" called with no value for ERROR_VARIABLE.");
return false;
- }
}
- else if(args[i] == "RESULT_VARIABLE")
- {
+ } else if (args[i] == "RESULT_VARIABLE") {
doing_command = false;
- if(++i < args.size())
- {
+ if (++i < args.size()) {
result_variable = args[i];
- }
- else
- {
+ } else {
this->SetError(" called with no value for RESULT_VARIABLE.");
return false;
- }
}
- else if(args[i] == "WORKING_DIRECTORY")
- {
+ } else if (args[i] == "WORKING_DIRECTORY") {
doing_command = false;
- if(++i < args.size())
- {
+ if (++i < args.size()) {
working_directory = args[i];
- }
- else
- {
+ } else {
this->SetError(" called with no value for WORKING_DIRECTORY.");
return false;
- }
}
- else if(args[i] == "INPUT_FILE")
- {
+ } else if (args[i] == "INPUT_FILE") {
doing_command = false;
- if(++i < args.size())
- {
+ if (++i < args.size()) {
input_file = args[i];
- }
- else
- {
+ } else {
this->SetError(" called with no value for INPUT_FILE.");
return false;
- }
}
- else if(args[i] == "OUTPUT_FILE")
- {
+ } else if (args[i] == "OUTPUT_FILE") {
doing_command = false;
- if(++i < args.size())
- {
+ if (++i < args.size()) {
output_file = args[i];
- }
- else
- {
+ } else {
this->SetError(" called with no value for OUTPUT_FILE.");
return false;
- }
}
- else if(args[i] == "ERROR_FILE")
- {
+ } else if (args[i] == "ERROR_FILE") {
doing_command = false;
- if(++i < args.size())
- {
+ if (++i < args.size()) {
error_file = args[i];
- }
- else
- {
+ } else {
this->SetError(" called with no value for ERROR_FILE.");
return false;
- }
}
- else if(args[i] == "TIMEOUT")
- {
+ } else if (args[i] == "TIMEOUT") {
doing_command = false;
- if(++i < args.size())
- {
+ if (++i < args.size()) {
timeout_string = args[i];
- }
- else
- {
+ } else {
this->SetError(" called with no value for TIMEOUT.");
return false;
- }
}
- else if(args[i] == "OUTPUT_QUIET")
- {
+ } else if (args[i] == "OUTPUT_QUIET") {
doing_command = false;
output_quiet = true;
- }
- else if(args[i] == "ERROR_QUIET")
- {
+ } else if (args[i] == "ERROR_QUIET") {
doing_command = false;
error_quiet = true;
- }
- else if(args[i] == "OUTPUT_STRIP_TRAILING_WHITESPACE")
- {
+ } else if (args[i] == "OUTPUT_STRIP_TRAILING_WHITESPACE") {
doing_command = false;
output_strip_trailing_whitespace = true;
- }
- else if(args[i] == "ERROR_STRIP_TRAILING_WHITESPACE")
- {
+ } else if (args[i] == "ERROR_STRIP_TRAILING_WHITESPACE") {
doing_command = false;
error_strip_trailing_whitespace = true;
- }
- else if(doing_command)
- {
+ } else if (doing_command) {
cmds[command_index].push_back(args[i].c_str());
- }
- else
- {
+ } else {
std::ostringstream e;
e << " given unknown argument \"" << args[i] << "\".";
this->SetError(e.str());
return false;
- }
}
+ }
- if ( !this->Makefile->CanIWriteThisFile(output_file.c_str()) )
- {
- std::string e = "attempted to output into a file: " + output_file
- + " into a source directory.";
+ if (!this->Makefile->CanIWriteThisFile(output_file.c_str())) {
+ std::string e = "attempted to output into a file: " + output_file +
+ " into a source directory.";
this->SetError(e);
cmSystemTools::SetFatalErrorOccured();
return false;
- }
+ }
// Check for commands given.
- if(cmds.empty())
- {
+ if (cmds.empty()) {
this->SetError(" called with no COMMAND argument.");
return false;
- }
- for(unsigned int i=0; i < cmds.size(); ++i)
- {
- if(cmds[i].empty())
- {
+ }
+ for (unsigned int i = 0; i < cmds.size(); ++i) {
+ if (cmds[i].empty()) {
this->SetError(" given COMMAND argument with no value.");
return false;
- }
- else
- {
+ } else {
// Add the null terminating pointer to the command argument list.
cmds[i].push_back(0);
- }
}
+ }
// Parse the timeout string.
double timeout = -1;
- if(!timeout_string.empty())
- {
- if(sscanf(timeout_string.c_str(), "%lg", &timeout) != 1)
- {
+ if (!timeout_string.empty()) {
+ if (sscanf(timeout_string.c_str(), "%lg", &timeout) != 1) {
this->SetError(" called with TIMEOUT value that could not be parsed.");
return false;
- }
}
+ }
// Create a process instance.
cmsysProcess* cp = cmsysProcess_New();
// Set the command sequence.
- for(unsigned int i=0; i < cmds.size(); ++i)
- {
+ for (unsigned int i = 0; i < cmds.size(); ++i) {
cmsysProcess_AddCommand(cp, &*cmds[i].begin());
- }
+ }
// Set the process working directory.
- if(!working_directory.empty())
- {
+ if (!working_directory.empty()) {
cmsysProcess_SetWorkingDirectory(cp, working_directory.c_str());
- }
+ }
// Always hide the process window.
cmsysProcess_SetOption(cp, cmsysProcess_Option_HideWindow, 1);
// Check the output variables.
bool merge_output = false;
- if(!input_file.empty())
- {
+ if (!input_file.empty()) {
cmsysProcess_SetPipeFile(cp, cmsysProcess_Pipe_STDIN, input_file.c_str());
- }
- if(!output_file.empty())
- {
+ }
+ if (!output_file.empty()) {
cmsysProcess_SetPipeFile(cp, cmsysProcess_Pipe_STDOUT,
output_file.c_str());
- }
- if(!error_file.empty())
- {
- if (error_file == output_file)
- {
+ }
+ if (!error_file.empty()) {
+ if (error_file == output_file) {
merge_output = true;
- }
- else
- {
+ } else {
cmsysProcess_SetPipeFile(cp, cmsysProcess_Pipe_STDERR,
error_file.c_str());
- }
}
- if (!output_variable.empty() && output_variable == error_variable)
- {
+ }
+ if (!output_variable.empty() && output_variable == error_variable) {
merge_output = true;
- }
- if (merge_output)
- {
+ }
+ if (merge_output) {
cmsysProcess_SetOption(cp, cmsysProcess_Option_MergeOutput, 1);
- }
+ }
// Set the timeout if any.
- if(timeout >= 0)
- {
+ if (timeout >= 0) {
cmsysProcess_SetTimeout(cp, timeout);
- }
+ }
// Start the process.
cmsysProcess_Execute(cp);
@@ -302,81 +228,61 @@ bool cmExecuteProcessCommand
int length;
char* data;
int p;
- while((p = cmsysProcess_WaitForData(cp, &data, &length, 0), p))
- {
+ while ((p = cmsysProcess_WaitForData(cp, &data, &length, 0), p)) {
// Put the output in the right place.
- if (p == cmsysProcess_Pipe_STDOUT && !output_quiet)
- {
- if(output_variable.empty())
- {
+ if (p == cmsysProcess_Pipe_STDOUT && !output_quiet) {
+ if (output_variable.empty()) {
cmSystemTools::Stdout(data, length);
- }
- else
- {
+ } else {
cmExecuteProcessCommandAppend(tempOutput, data, length);
- }
}
- else if(p == cmsysProcess_Pipe_STDERR && !error_quiet)
- {
- if(error_variable.empty())
- {
+ } else if (p == cmsysProcess_Pipe_STDERR && !error_quiet) {
+ if (error_variable.empty()) {
cmSystemTools::Stderr(data, length);
- }
- else
- {
+ } else {
cmExecuteProcessCommandAppend(tempError, data, length);
- }
}
}
+ }
// All output has been read. Wait for the process to exit.
cmsysProcess_WaitForExit(cp, 0);
// Fix the text in the output strings.
- cmExecuteProcessCommandFixText(tempOutput,
- output_strip_trailing_whitespace);
- cmExecuteProcessCommandFixText(tempError,
- error_strip_trailing_whitespace);
+ cmExecuteProcessCommandFixText(tempOutput, output_strip_trailing_whitespace);
+ cmExecuteProcessCommandFixText(tempError, error_strip_trailing_whitespace);
// Store the output obtained.
- if(!output_variable.empty() && !tempOutput.empty())
- {
- this->Makefile->AddDefinition(output_variable,
- &*tempOutput.begin());
- }
- if(!merge_output && !error_variable.empty() && !tempError.empty())
- {
- this->Makefile->AddDefinition(error_variable,
- &*tempError.begin());
- }
+ if (!output_variable.empty() && !tempOutput.empty()) {
+ this->Makefile->AddDefinition(output_variable, &*tempOutput.begin());
+ }
+ if (!merge_output && !error_variable.empty() && !tempError.empty()) {
+ this->Makefile->AddDefinition(error_variable, &*tempError.begin());
+ }
// Store the result of running the process.
- if(!result_variable.empty())
- {
- switch(cmsysProcess_GetState(cp))
- {
- case cmsysProcess_State_Exited:
- {
+ if (!result_variable.empty()) {
+ switch (cmsysProcess_GetState(cp)) {
+ case cmsysProcess_State_Exited: {
int v = cmsysProcess_GetExitValue(cp);
char buf[100];
sprintf(buf, "%d", v);
this->Makefile->AddDefinition(result_variable, buf);
- }
- break;
+ } break;
case cmsysProcess_State_Exception:
this->Makefile->AddDefinition(result_variable,
- cmsysProcess_GetExceptionString(cp));
+ cmsysProcess_GetExceptionString(cp));
break;
case cmsysProcess_State_Error:
this->Makefile->AddDefinition(result_variable,
- cmsysProcess_GetErrorString(cp));
+ cmsysProcess_GetErrorString(cp));
break;
case cmsysProcess_State_Expired:
this->Makefile->AddDefinition(result_variable,
- "Process terminated due to timeout");
+ "Process terminated due to timeout");
break;
- }
}
+ }
// Delete the process instance.
cmsysProcess_Delete(cp);
@@ -390,25 +296,22 @@ 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())
- {
+ while (in_index < output.size()) {
char c = output[in_index++];
- if((c != '\r' || !(in_index < output.size() && output[in_index] == '\n'))
- && c != '\0')
- {
+ if ((c != '\r' ||
+ !(in_index < output.size() && output[in_index] == '\n')) &&
+ c != '\0') {
output[out_index++] = c;
- }
}
+ }
// Remove trailing whitespace if requested.
- if(strip_trailing_whitespace)
- {
- while(out_index > 0 &&
- cmExecuteProcessCommandIsWhitespace(output[out_index-1]))
- {
+ if (strip_trailing_whitespace) {
+ while (out_index > 0 &&
+ cmExecuteProcessCommandIsWhitespace(output[out_index - 1])) {
--out_index;
- }
}
+ }
// Shrink the vector to the size needed.
output.resize(out_index);
@@ -417,19 +320,18 @@ void cmExecuteProcessCommandFixText(std::vector<char>& output,
output.push_back('\0');
}
-void cmExecuteProcessCommandAppend(std::vector<char>& output,
- const char* data, int length)
+void cmExecuteProcessCommandAppend(std::vector<char>& output, const char* data,
+ int length)
{
#if defined(__APPLE__)
// HACK on Apple to work around bug with inserting at the
// end of an empty vector. This resulted in random failures
// that were hard to reproduce.
- if(output.empty() && length > 0)
- {
+ if (output.empty() && length > 0) {
output.push_back(data[0]);
++data;
--length;
- }
+ }
#endif
- output.insert(output.end(), data, data+length);
+ output.insert(output.end(), data, data + length);
}