[libFuzzer] Diff 18 - Avoid name collision with Windows API.

[mpividori]

Summary

Windows uses some macros to replace DeleteFile() by DeleteFileA() or DeleteFileW(). This was causing an error at link time.
I could have used "#undef DeleteFile", but I decided to change the function name to avoid future problem if we want to use Windows's function DeleteFile().

[kcc]

LGTM
(and I will keep my opinion about preprocessor macros in windows API to myself)

[amccarth]

I won't object to this change, but, in my experience, the #undef approach is better. It doesn't force you to compromise your API design, and it keeps the Windows-specific fixes local to the Windows-specific code.

If we were to #undef DeleteFile and later wanted to call the actual WinAPI DeleteFile, we'd just have to use the actual function name, either DeleteFileW or DeleteFileA, which modern code should be doing anyway.

llvm/trunk/lib/Fuzzer/FuzzerCorpus.h

for (size_t i = 0; i < Inputs.size(); i++)
       if (size_t N = Inputs[i]->NumFeatures)
         Printf(" %zd=>%zd ", i, N);
     Printf("\n");
   }
 
   void DeleteInput(size_t Idx) {
     InputInfo &II = *Inputs[Idx];
     if (!OutputCorpus.empty() && II.MayDeleteFile)
-      DeleteFile(DirPlusFile(OutputCorpus, Sha1ToString(II.Sha1)));
+      RemoveFile(DirPlusFile(OutputCorpus, Sha1ToString(II.Sha1)));
     Unit().swap(II.U);
     if (FeatureDebug)
       Printf("EVICTED %zd\n", Idx);
   }
 
   bool AddFeature(size_t Idx, uint32_t NewSize, bool Shrink) {
     assert(NewSize);
     Idx = Idx % kFeatureSetSize;

llvm/trunk/lib/Fuzzer/FuzzerIO.h

 char GetSeparator();
 
 FILE* OpenFile(int Fd, const char *Mode);
 
 int CloseFile(int Fd);
 
 int DuplicateFile(int Fd);
 
-void DeleteFile(const std::string &Path);
+void RemoveFile(const std::string &Path);
 
 }  // namespace fuzzer
 
 #endif  // LLVM_FUZZER_IO_H

llvm/trunk/lib/Fuzzer/FuzzerIOPosix.cpp

 int CloseFile(int fd) {
   return close(fd);
 }
 
 int DuplicateFile(int Fd) {
   return dup(Fd);
 }
 
-void DeleteFile(const std::string &Path) {
+void RemoveFile(const std::string &Path) {
   unlink(Path.c_str());
 }
 
 std::string DirName(const std::string &FileName) {
   char *Tmp = new char[FileName.size() + 1];
   memcpy(Tmp, FileName.c_str(), FileName.size() + 1);
   std::string Res = dirname(Tmp);
   delete [] Tmp;
   return Res;
 }
 
 }  // namespace fuzzer
 
 #endif // LIBFUZZER_POSIX

llvm/trunk/lib/Fuzzer/FuzzerIOWindows.cpp

 int CloseFile(int Fd) {
   return _close(Fd);
 }
 
 int DuplicateFile(int Fd) {
   return _dup(Fd);
 }
 
-void DeleteFile(const std::string &Path) {
+void RemoveFile(const std::string &Path) {
   _unlink(Path.c_str());
 }
 
 static bool IsSeparator(char C) {
   return C == '\\' || C == '/';
 }
 
 // Parse disk designators, like "C:\". If Relative == true, also accepts: "C:".

llvm/trunk/lib/Fuzzer/FuzzerMerge.cpp

void Fuzzer::CrashResistantMerge(const std::vector<std::string> &Args,
   size_t NumFilesInFirstCorpus = AllFiles.size();
   for (size_t i = 1; i < Corpora.size(); i++)
     ListFilesInDirRecursive(Corpora[i], nullptr, &AllFiles, /*TopDir*/true);
   Printf("MERGE-OUTER: %zd files, %zd in the initial corpus\n",
          AllFiles.size(), NumFilesInFirstCorpus);
   std::string CFPath =
       "libFuzzerTemp." + std::to_string(GetPid()) + ".txt";
   // Write the control file.
-  DeleteFile(CFPath);
+  RemoveFile(CFPath);
   std::ofstream ControlFile(CFPath);
   ControlFile << AllFiles.size() << "\n";
   ControlFile << NumFilesInFirstCorpus << "\n";
   for (auto &Path: AllFiles)
     ControlFile << Path << "\n";
   ControlFile.close();
 
   // Execute the inner process untill it passes.
void Fuzzer::CrashResistantMerge(const std::vector<std::string> &Args,
   IF.close();
   std::vector<std::string> NewFiles;
   size_t NumNewFeatures = M.Merge(&NewFiles);
   Printf("MERGE-OUTER: %zd new files with %zd new features added\n",
          NewFiles.size(), NumNewFeatures);
   for (auto &F: NewFiles)
     WriteToOutputCorpus(FileToVector(F));
   // We are done, delete the control file.
-  DeleteFile(CFPath);
+  RemoveFile(CFPath);
 }
 
 } // namespace fuzzer