Pass commandvec by reference

This changes to pass the vector of strings for the piped_process
command by reference instead of by value.

Author: TGWDB

src/util/piped_process.cpp

@@ -102,19 +102,19 @@
 #  define BUFSIZE 2048
 
 #ifdef _WIN32
-std::wstring process_windows_args(const std::vector<std::string> commandvec)
+std::wstring process_windows_args(const std::vector<std::string> *commandvec)
 {
-  std::wstring result = widen(commandvec[0]);
-  for(int i = 1; i < commandvec.size(); i++)
+  std::wstring result = widen(commandvec->at(0));
+  for(int i = 1; i < commandvec->size(); i++)
   {
     result.append(L" ");
-    result.append(quote_windows_arg(widen(commandvec[i])));
+    result.append(quote_windows_arg(widen(commandvec->at(i))));
   }
   return result;
 }
 #endif
 
-piped_processt::piped_processt(const std::vector<std::string> commandvec)
+piped_processt::piped_processt(const std::vector<std::string> *commandvec)
 {
 #  ifdef _WIN32
   // Security attributes for pipe creation
@@ -261,16 +261,16 @@ piped_processt::piped_processt(const std::vector<std::string> commandvec)
     // Create a char** for the arguments (all the contents of commandvec
     // except the first element, i.e. the command itself).
     char **args =
-      reinterpret_cast<char **>(malloc((commandvec.size()) * sizeof(char *)));
+      reinterpret_cast<char **>(malloc((commandvec->size()) * sizeof(char *)));
     // Add all the arguments to the args array of char *.
     unsigned long i = 0;
-    while(i < commandvec.size())
+    while(i < commandvec->size())
     {
-      args[i] = strdup(commandvec[i].c_str());
+      args[i] = strdup(commandvec->at(i).c_str());
       i++;
     }
     args[i] = NULL;
-    execvp(commandvec[0].c_str(), args);
+    execvp(commandvec->at(0).c_str(), args);
     // The args variable will be handled by the OS if execvp succeeds, but
     // if execvp fails then we should free it here (just in case the runtime
     // error below continues execution.)
@@ -283,7 +283,7 @@ piped_processt::piped_processt(const std::vector<std::string> commandvec)
     // Only reachable if execvp failed
     // Note that here we send to std::cerr since we are in the child process
     // here and this is received by the parent process.
-    std::cerr << "Launching " << commandvec[0]
+    std::cerr << "Launching " << commandvec->at(0)
               << " failed with error: " << std::strerror(errno) << std::endl;
     abort();
   }

src/util/piped_process.h

@@ -78,7 +78,7 @@ class piped_processt
   /// Initiate a new subprocess with pipes supporting communication
   /// between the parent (this process) and the child.
   /// \param commandvec The command and arguments to create the process
-  explicit piped_processt(const std::vector<std::string> commandvec);
+  explicit piped_processt(const std::vector<std::string> *commandvec);
 
   // Deleted due to declaring an explicit destructor and not wanting copy
   // constructors to be implemented.

unit/util/piped_process.cpp

@@ -22,7 +22,7 @@ TEST_CASE(
   commands.push_back("/bin/echo");
   commands.push_back(to_be_echoed);
 #endif
-  piped_processt process(commands);
+  piped_processt process(&commands);
 
   // This is an indirect way to detect when the pipe has something. This
   // could (in theory) also return when there is an error, but this unit
@@ -45,7 +45,7 @@ TEST_CASE(
   const std::string expected_error("Launching abcde failed");
   commands.push_back("abcde");
 #endif
-  piped_processt process(commands);
+  piped_processt process(&commands);
 
   // This is an indirect way to detect when the pipe has something. This
   // could (in theory) also return when there is an error, but this unit
@@ -81,7 +81,7 @@ TEST_CASE(
     std::chrono::steady_clock::now();
   {
     // Scope restriction to cause destruction
-    piped_processt process(commands);
+    piped_processt process(&commands);
   }
   std::chrono::steady_clock::time_point end_time =
     std::chrono::steady_clock::now();
@@ -93,7 +93,7 @@ TEST_CASE(
   // Currently not working under Linxu/MacOS?!
   // commands.push_back("sleep 6");
   // time_t calc = time(NULL);
-  // piped_processt process(commands);
+  // piped_processt process(&commands);
   // process.~piped_processt();
   // calc = time(NULL) - calc;
   size_t calc = 0;
@@ -112,7 +112,7 @@ TEST_CASE(
   std::vector<std::string> commands;
   commands.push_back("z3");
   commands.push_back("-in");
-  piped_processt process(commands);
+  piped_processt process(&commands);
 
   REQUIRE(
     process.send("(echo \"hi\")\n") ==
@@ -134,7 +134,7 @@ TEST_CASE(
   commands.push_back("z3");
   commands.push_back("-in");
   const std::string termination_statement = "(exit)\n";
-  piped_processt process(commands);
+  piped_processt process(&commands);
 
   REQUIRE(
     process.send("(echo \"hi\")\n") ==
@@ -164,7 +164,7 @@ TEST_CASE(
   commands.push_back("z3");
   commands.push_back("-in");
   commands.push_back("-smt2");
-  piped_processt process(commands);
+  piped_processt process(&commands);
 
   std::string message =
     "(set-logic QF_LIA) (declare-const x Int) (declare-const y Int) (assert (> "
@@ -188,7 +188,7 @@ TEST_CASE(
   commands.push_back("z3");
   commands.push_back("-in");
   commands.push_back("-smt2");
-  piped_processt process(commands);
+  piped_processt process(&commands);
 
   std::string statement =
     "(set-logic QF_LIA) (declare-const x Int) (declare-const y Int) (assert (> "
@@ -210,7 +210,7 @@ TEST_CASE(
   std::vector<std::string> commands;
   commands.push_back("z3");
   commands.push_back("-in");
-  piped_processt process(commands);
+  piped_processt process(&commands);
 
   REQUIRE(
     process.send("(echo \"hi\")\n") ==
@@ -240,7 +240,7 @@ TEST_CASE(
   commands.push_back("z3");
   commands.push_back("-in");
   commands.push_back("-smt2");
-  piped_processt process(commands);
+  piped_processt process(&commands);
 
   std::string statement =
     "(set-logic QF_LIA) (declare-const x Int) (declare-const y Int) (assert (> "
@@ -296,7 +296,7 @@ TEST_CASE(
   commands.push_back("z3");
   commands.push_back("-in");
   commands.push_back("-smt2");
-  piped_processt process(commands);
+  piped_processt process(&commands);
 
   std::string statement =
     "(set-logic QF_LIA) (declare-const x Int) (declare-const y Int) (assert (> "