use run() in ansi-c/c_preprocess

Author: Daniel Kroening

src/ansi-c/c_preprocess.cpp

@@ -10,6 +10,7 @@ Author: Daniel Kroening, [email protected]
 
 #include <util/c_types.h>
 #include <util/config.h>
+#include <util/run.h>
 #include <util/suffix.h>
 #include <util/tempfile.h>
 #include <util/unicode.h>
@@ -383,8 +384,9 @@ bool c_preprocess_visual_studio(
   command += " 2> \"" + stderr_file() + "\"";
 
   // _popen isn't very reliable on WIN32
-  // that's why we use system()
-  int result=system(command.c_str());
+  // that's why we use run()
+  int result =
+    run("cl", {"cl", "@" + command_file_name()}, "", tmpi(), stderr_file());
 
   std::ifstream instream(tmpi());
 
@@ -463,30 +465,30 @@ bool c_preprocess_codewarrior(
 
   temporary_filet stderr_file("tmp.stderr", "");
 
-  std::string command;
-
-  command="mwcceppc -E -P -D__CPROVER__ -ppopt line -ppopt full";
+  std::vector<std::string> command =
+    { "mwcceppc", "-E", "-P", "-D__CPROVER__", "-ppopt", "line", "-ppopt full" };
 
   for(const auto &define : config.ansi_c.defines)
-    command+=" -D"+shell_quote(define);
+    command.push_back(" -D"+define);
 
   for(const auto &include_path : config.ansi_c.include_paths)
-    command+=" -I"+shell_quote(include_path);
+    command.push_back(" -I"+include_path);
 
   for(const auto &include_file : config.ansi_c.include_files)
-    command+=" -include "+shell_quote(include_file);
+  {
+    command.push_back(" -include");
+    command.push_back(include_file);
+  }
 
   for(const auto &opt : config.ansi_c.preprocessor_options)
-    command+=" "+opt;
-
-  int result;
+    command.push_back(opt);
 
   temporary_filet tmpi("tmp.cl", "");
-  command+=" \""+file+"\"";
-  command += " -o \"" + tmpi() + "\"";
-  command += " 2> \"" + stderr_file() + "\"";
+  command.push_back(file);
+  command.push_back("-o");
+  command.push_back(tmpi());
 
-  result=system(command.c_str());
+  int result = run(command[0], command, "", "", stderr_file());
 
   std::ifstream stream_i(tmpi());
 
@@ -667,7 +669,7 @@ bool c_preprocess_gcc_clang(
   command += " 2> \"" + stderr_file() + "\"";
 
   // _popen isn't very reliable on WIN32
-  // that's why we use system() and a temporary file
+  // that's why we use run() and a temporary file
   result=system(command.c_str());
 
   std::ifstream instream(tmpi());