Merge pull request #3336 from diffblue/fix-run3

fix a run() variant on non-Windows OSs [blocks: #2310]

Author: Daniel Kroening

src/util/run.cpp

@@ -493,8 +493,25 @@ int run(
   #else
   std::string command;
 
+  bool first = true;
+
+  // note we use 'what' instead of 'argv[0]' as the name of the executable
   for(const auto &arg : argv)
-    command += " " + shell_quote(arg);
+  {
+    if(first) // this is argv[0]
+    {
+      command += shell_quote(what);
+      first = false;
+    }
+    else
+      command += " " + shell_quote(arg);
+  }
+
+  if(!std_input.empty())
+    command += " < " + shell_quote(std_input);
+
+  if(!std_error.empty())
+    command += " 2> " + shell_quote(std_error);
 
   FILE *stream=popen(command.c_str(), "r");
 

src/util/run.h

@@ -18,14 +18,26 @@ Date: August 2012
 
 int run(const std::string &what, const std::vector<std::string> &argv);
 
+/// This runs the executable given by the file name \p what.
+/// Control returns when execution has finished.
+/// Stdin, stdout and stderr may be redirected from/to a given file.
+/// Give the empty string to retain the default handle.
+/// Any shell-meta characters in the executable, \p argv and the I/O
+/// redirect files are escaped as needed.
 int run(
   const std::string &what,
   const std::vector<std::string> &argv,
   const std::string &std_input,
   const std::string &std_output,
   const std::string &std_error);
 
-/// A variant that streams the stdout of the child into an ostream
+/// This runs the executable given by the file name \p what.
+/// Control returns when execution has finished.
+/// Stdin and stderr may be redirected from/to a given file.
+/// Give the empty string to retain the default handle.
+/// Any output to stdout is stored in the \p std_output stream buffer.
+/// Any shell-meta characters in the executable, \p argv and the I/O
+/// redirect files are escaped as needed.
 int run(
   const std::string &what,
   const std::vector<std::string> &argv,