Просмотр исходного кода

Source: Remove redundant FileIsDirectory checks

scivision 2 лет назад
Родитель
Сommit
d49ea4a4d9

+ 2 - 4
Source/CTest/cmCTestTestHandler.cxx

@@ -1711,8 +1711,7 @@ std::string cmCTestTestHandler::FindExecutable(
   // now look in the paths we specified above
   for (unsigned int ai = 0; ai < attempted.size() && fullPath.empty(); ++ai) {
     // first check without exe extension
-    if (cmSystemTools::FileExists(attempted[ai]) &&
-        !cmSystemTools::FileIsDirectory(attempted[ai])) {
+    if (cmSystemTools::FileExists(attempted[ai], true)) {
       fullPath = cmSystemTools::CollapseFullPath(attempted[ai]);
       resultingConfig = attemptedConfigs[ai];
     }
@@ -1721,8 +1720,7 @@ std::string cmCTestTestHandler::FindExecutable(
       failed.push_back(attempted[ai]);
       tempPath =
         cmStrCat(attempted[ai], cmSystemTools::GetExecutableExtension());
-      if (cmSystemTools::FileExists(tempPath) &&
-          !cmSystemTools::FileIsDirectory(tempPath)) {
+      if (cmSystemTools::FileExists(tempPath, true)) {
         fullPath = cmSystemTools::CollapseFullPath(tempPath);
         resultingConfig = attemptedConfigs[ai];
       } else {

+ 1 - 2
Source/cmCTest.cxx

@@ -1004,8 +1004,7 @@ int cmCTest::ProcessSteps()
       for (kk = 0; kk < d.GetNumberOfFiles(); kk++) {
         const char* file = d.GetFile(kk);
         std::string fullname = notes_dir + "/" + file;
-        if (cmSystemTools::FileExists(fullname) &&
-            !cmSystemTools::FileIsDirectory(fullname)) {
+        if (cmSystemTools::FileExists(fullname, true)) {
           if (!this->Impl->NotesFiles.empty()) {
             this->Impl->NotesFiles += ";";
           }

+ 1 - 2
Source/cmInstallCommand.cxx

@@ -1837,8 +1837,7 @@ bool HandleDirectoryMode(std::vector<std::string> const& args,
       }
 
       // Make sure the name is a directory.
-      if (cmSystemTools::FileExists(dir) &&
-          !cmSystemTools::FileIsDirectory(dir)) {
+      if (cmSystemTools::FileExists(dir, true)) {
         status.SetError(cmStrCat(args[0], " given non-directory \"", args[i],
                                  "\" to install."));
         return false;

+ 2 - 4
Source/cmOutputRequiredFilesCommand.cxx

@@ -414,8 +414,7 @@ protected:
         path += "/";
       }
       path += fname;
-      if (cmSystemTools::FileExists(path, true) &&
-          !cmSystemTools::FileIsDirectory(path)) {
+      if (cmSystemTools::FileExists(path, true)) {
         std::string fp = cmSystemTools::CollapseFullPath(path);
         this->DirectoryToFileToPathMap[extraPath][fname] = fp;
         return fp;
@@ -428,8 +427,7 @@ protected:
         path = path + "/";
       }
       path = path + fname;
-      if (cmSystemTools::FileExists(path, true) &&
-          !cmSystemTools::FileIsDirectory(path)) {
+      if (cmSystemTools::FileExists(path, true)) {
         std::string fp = cmSystemTools::CollapseFullPath(path);
         this->DirectoryToFileToPathMap[extraPath][fname] = fp;
         return fp;