[Fuzzer] Rename ExecuteCommandWithPopen to ExecuteCommandNon-Fushsia target will keep using popen/pclose implementation. OnFuchsia, Two-args version of ExecuteCommand is a simple wrapper of theone-arg version. (Hopefully) Fix D73329 build on Fuchsia.

Author: Yuanfang Chen

compiler-rt/lib/fuzzer/FuzzerDriver.cpp

@@ -316,20 +316,6 @@ static std::string GetDedupTokenFromCmdOutput(const std::string &S) {
   return S.substr(Beg, End - Beg);
 }
 
-// Return true on success, false otherwise.
-static bool ExecuteCommandWithPopen(const Command &Cmd, std::string *CmdOutput) {
-  FILE *Pipe = OpenProcessPipe(Cmd.toString().c_str(), "r");
-  if (!Pipe)
-    return false;
-
-  if (CmdOutput) {
-    char TmpBuffer[128];
-    while (fgets(TmpBuffer, sizeof(TmpBuffer), Pipe))
-      CmdOutput->append(TmpBuffer);
-  }
-  return CloseProcessPipe(Pipe) == 0;
-}
-
 int CleanseCrashInput(const Vector<std::string> &Args,
                        const FuzzingOptions &Options) {
   if (Inputs->size() != 1 || !Flags.exact_artifact_path) {
@@ -417,7 +403,7 @@ int MinimizeCrashInput(const Vector<std::string> &Args,
 
     Printf("CRASH_MIN: executing: %s\n", Cmd.toString().c_str());
     std::string CmdOutput;
-    bool Success = ExecuteCommandWithPopen(Cmd, &CmdOutput);
+    bool Success = ExecuteCommand(Cmd, &CmdOutput);
     if (Success) {
       Printf("ERROR: the input %s did not crash\n", CurrentFilePath.c_str());
       exit(1);
@@ -437,7 +423,7 @@ int MinimizeCrashInput(const Vector<std::string> &Args,
     Cmd.addFlag("exact_artifact_path", ArtifactPath);
     Printf("CRASH_MIN: executing: %s\n", Cmd.toString().c_str());
     CmdOutput.clear();
-    Success = ExecuteCommandWithPopen(Cmd, &CmdOutput);
+    Success = ExecuteCommand(Cmd, &CmdOutput);
     Printf("%s", CmdOutput.c_str());
     if (Success) {
       if (Flags.exact_artifact_path) {

compiler-rt/lib/fuzzer/FuzzerUtil.h

@@ -57,7 +57,9 @@ unsigned long GetPid();
 size_t GetPeakRSSMb();
 
 int ExecuteCommand(const Command &Cmd);
+bool ExecuteCommand(const Command &Cmd, std::string *CmdOutput);
 
+// Fuchsia does not have popen/pclose.
 FILE *OpenProcessPipe(const char *Command, const char *Mode);
 int CloseProcessPipe(FILE *F);
 

compiler-rt/lib/fuzzer/FuzzerUtilFuchsia.cpp

@@ -533,6 +533,16 @@ int ExecuteCommand(const Command &Cmd) {
   return Info.return_code;
 }
 
+bool ExecuteCommand(const Command &BaseCmd, std::string *CmdOutput) {
+  auto LogFilePath = TempPath("SimPopenOut", ".txt");
+  Command Cmd(BaseCmd);
+  Cmd.setOutputFile(LogFilePath);
+  int Ret = ExecuteCommand(Cmd);
+  *CmdOutput = FileToString(LogFilePath);
+  RemoveFile(LogFilePath);
+  return Ret == 0;
+}
+
 const void *SearchMemory(const void *Data, size_t DataLen, const void *Patt,
                          size_t PattLen) {
   return memmem(Data, DataLen, Patt, PattLen);

compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp

@@ -86,6 +86,20 @@ static void SetSigaction(int signum,
   }
 }
 
+// Return true on success, false otherwise.
+bool ExecuteCommand(const Command &Cmd, std::string *CmdOutput) {
+  FILE *Pipe = popen(Cmd.toString().c_str(), "r");
+  if (!Pipe)
+    return false;
+
+  if (CmdOutput) {
+    char TmpBuffer[128];
+    while (fgets(TmpBuffer, sizeof(TmpBuffer), Pipe))
+      CmdOutput->append(TmpBuffer);
+  }
+  return pclose(Pipe) == 0;
+}
+
 void SetTimer(int Seconds) {
   struct itimerval T {
     {Seconds, 0}, { Seconds, 0 }

compiler-rt/lib/fuzzer/FuzzerUtilWindows.cpp

@@ -161,6 +161,19 @@ int ExecuteCommand(const Command &Cmd) {
   return system(CmdLine.c_str());
 }
 
+bool ExecuteCommand(const Command &Cmd, std::string *CmdOutput) {
+  FILE *Pipe = _popen(Cmd.toString().c_str(), "r");
+  if (!Pipe)
+    return false;
+
+  if (CmdOutput) {
+    char TmpBuffer[128];
+    while (fgets(TmpBuffer, sizeof(TmpBuffer), Pipe))
+      CmdOutput->append(TmpBuffer);
+  }
+  return _pclose(Pipe) == 0;
+}
+
 const void *SearchMemory(const void *Data, size_t DataLen, const void *Patt,
                          size_t PattLen) {
   // TODO: make this implementation more efficient.