Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added optional parameter to Path::exists() to indicate if the existing path is a directory #7263

Merged
merged 1 commit into from
Feb 5, 2025
Merged

added optional parameter to Path::exists() to indicate if the existing path is a directory #7263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions lib/path.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,10 +426,18 @@ bool Path::isDirectory(const std::string &path)
return file_type(path) == S_IFDIR;
}

bool Path::exists(const std::string &path)
bool Path::exists(const std::string &path, bool* isdir)
{
const auto type = file_type(path);
return type == S_IFREG || type == S_IFDIR;
if (type == S_IFDIR)
{
if (isdir)
*isdir = true;
return true;
}
if (isdir)
*isdir = false;
return type == S_IFREG;
}

std::string Path::join(const std::string& path1, const std::string& path2) {
Expand Down
3 changes: 2 additions & 1 deletion lib/path.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,10 @@ class CPPCHECKLIB Path {
/**
* @brief Checks if a given path exists (i.e. is a file or directory)
* @param path Path to be checked
* @param isdir Optional parameter which indicates if the existing path is a directory
* @return true if given path exists
*/
static bool exists(const std::string &path);
static bool exists(const std::string &path, bool* isdir = nullptr);

/**
* join 2 paths with '/' separators
Expand Down
20 changes: 17 additions & 3 deletions test/testpath.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,13 +551,27 @@ class TestPath : public TestFixture {
void exists() const {
ScopedFile file("testpath.txt", "", "testpath");
ScopedFile file2("testpath2.txt", "");

ASSERT_EQUALS(true, Path::exists("testpath"));
ASSERT_EQUALS(true, Path::exists("testpath/testpath.txt"));
ASSERT_EQUALS(true, Path::exists("testpath2.txt"));

ASSERT_EQUALS(false, Path::exists("testpath2"));
ASSERT_EQUALS(false, Path::exists("testpath/testpath2.txt"));
ASSERT_EQUALS(false, Path::exists("testpath.txt"));

bool b = false;

ASSERT_EQUALS(true, Path::exists("testpath", &b));
ASSERT_EQUALS(true, b);
ASSERT_EQUALS(true, Path::exists("testpath/testpath.txt", &b));
ASSERT_EQUALS(false, b);
ASSERT_EQUALS(true, Path::exists("testpath2.txt", &b));
ASSERT_EQUALS(false, b);

ASSERT_EQUALS(false, Path::exists("testpath2", &b));
ASSERT_EQUALS(false, b);
ASSERT_EQUALS(false, Path::exists("testpath/testpath2.txt", &b));
ASSERT_EQUALS(false, b);
ASSERT_EQUALS(false, Path::exists("testpath.txt", &b));
ASSERT_EQUALS(false, b);
}
};

Expand Down
Loading