Merge pull request #6091 from TGWDB/WIN32-run-fix

Unify shell_quote under util/run

Author: TGWDB

src/ansi-c/c_preprocess.cpp

@@ -22,80 +22,6 @@ Author: Daniel Kroening, [email protected]
 
 #include <fstream>
 
-/// quote a string for bash and CMD
-static std::string shell_quote(const std::string &src)
-{
-  #ifdef _WIN32
-  // first check if quoting is needed at all
-
-  if(src.find(' ')==std::string::npos &&
-     src.find('"')==std::string::npos &&
-     src.find('&')==std::string::npos &&
-     src.find('|')==std::string::npos &&
-     src.find('(')==std::string::npos &&
-     src.find(')')==std::string::npos &&
-     src.find('<')==std::string::npos &&
-     src.find('>')==std::string::npos &&
-     src.find('^')==std::string::npos)
-  {
-    // seems fine -- return as is
-    return src;
-  }
-
-  std::string result;
-
-  result+='"';
-
-  for(const char ch : src)
-  {
-    if(ch=='"')
-      result+='"'; // quotes are doubled
-    result+=ch;
-  }
-
-  result+='"';
-
-  return result;
-
-  #else
-
-  // first check if quoting is needed at all
-
-  if(src.find(' ')==std::string::npos &&
-     src.find('"')==std::string::npos &&
-     src.find('*')==std::string::npos &&
-     src.find('$')==std::string::npos &&
-     src.find('\\')==std::string::npos &&
-     src.find('?')==std::string::npos &&
-     src.find('&')==std::string::npos &&
-     src.find('|')==std::string::npos &&
-     src.find('>')==std::string::npos &&
-     src.find('<')==std::string::npos &&
-     src.find('^')==std::string::npos &&
-     src.find('\'')==std::string::npos)
-  {
-    // seems fine -- return as is
-    return src;
-  }
-
-  std::string result;
-
-  // the single quotes catch everything but themselves!
-  result+='\'';
-
-  for(const char ch : src)
-  {
-    if(ch=='\'')
-      result+="'\\''";
-    result+=ch;
-  }
-
-  result+='\'';
-
-  return result;
-  #endif
-}
-
 static void error_parse_line(
   const std::string &line,
   bool warning_only,

src/util/run.cpp

@@ -448,7 +448,7 @@ int run(
 }
 
 /// quote a string for bash and CMD
-static std::string shell_quote(const std::string &src)
+std::string shell_quote(const std::string &src)
 {
   #ifdef _WIN32
   // first check if quoting is needed at all

src/util/run.h

@@ -16,6 +16,9 @@ Date: August 2012
 #include <string>
 #include <vector>
 
+/// This performs shell quoting if necessary on input \p src.
+std::string shell_quote(const std::string &src);
+
 int run(const std::string &what, const std::vector<std::string> &argv);
 
 /// This runs the executable given by the file name \p what.