dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-03 06:10:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmFindPackageCommand: Deduplicate code to exclude . and .. dir entries

Browse Source
This commit is contained in:
Alex Turbov
2022-06-27 06:22:29 +04:00
parent 045e36fe36
commit b5f880d5c6
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmFindPackageCommand.cxx
View File

@@ -2152,6 +2152,7 @@ public:
protected:
bool Consider(std::string const& fullPath, cmFileList& listing);
static bool IsIgnoredEntry(const char* fname);
private:
bool Search(cmFileList&);
@@ -2236,6 +2237,12 @@ bool cmFileListGeneratorBase::Consider(std::string const& fullPath,
return listing.Visit(fullPath + '/');
}
bool cmFileListGeneratorBase::IsIgnoredEntry(const char* const fname)
{
assert(fname != nullptr);
return strcmp(fname, ".") == 0 || strcmp(fname, "..") == 0;
}
class cmFileListGeneratorFixed : public cmFileListGeneratorBase
{
public:
@@ -2330,7 +2337,7 @@ private:
d.Load(parent);
for (unsigned long i = 0; i < d.GetNumberOfFiles(); ++i) {
const char* fname = d.GetFile(i);
if (strcmp(fname, ".") == 0 || strcmp(fname, "..") == 0) {
if (this->IsIgnoredEntry(fname)) {
continue;
}
for (std::string const& n : this->Names) {
@@ -2386,7 +2393,7 @@ private:
d.Load(parent);
for (unsigned long i = 0; i < d.GetNumberOfFiles(); ++i) {
const char* fname = d.GetFile(i);
if (strcmp(fname, ".") == 0 || strcmp(fname, "..") == 0) {
if (this->IsIgnoredEntry(fname)) {
continue;
}
for (std::string name : this->Names) {
@@ -2433,7 +2440,7 @@ private:
d.Load(parent);
for (unsigned long i = 0; i < d.GetNumberOfFiles(); ++i) {
const char* fname = d.GetFile(i);
if (strcmp(fname, ".") == 0 || strcmp(fname, "..") == 0) {
if (this->IsIgnoredEntry(fname)) {
continue;
}
if (cmsysString_strcasecmp(fname, this->String.c_str()) == 0) {