Skip to content

Commit c5fb6db

Browse files
glankkglankk
committed
Use explicit basepath
1 parent bf664fd commit c5fb6db

8 files changed

Lines changed: 20 additions & 22 deletions

File tree

‎cli/cmdlineparser.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
209209
std::list<FileSettings> fileSettings;
210210
if (!mSettings.fileFilters.empty()) {
211211
// filter only for the selected filenames from all project files
212-
PathMatch filtermatcher(mSettings.fileFilters);
212+
PathMatch filtermatcher(mSettings.fileFilters, Path::getCurrentPath());
213213
std::copy_if(fileSettingsRef.cbegin(), fileSettingsRef.cend(), std::back_inserter(fileSettings), [&](const FileSettings &fs) {
214214
return filtermatcher.match(fs.filename());
215215
});
@@ -245,7 +245,7 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
245245
std::list<FileWithDetails> filesResolved;
246246
// Execute recursiveAddFiles() to each given file parameter
247247
// TODO: verbose log which files were ignored?
248-
const PathMatch matcher(ignored);
248+
const PathMatch matcher(ignored, Path::getCurrentPath());
249249
for (const std::string &pathname : pathnamesRef) {
250250
const std::string err = FileLister::recursiveAddFiles(filesResolved, Path::toNativeSeparators(pathname), mSettings.library.markupExtensions(), matcher, mSettings.debugignore);
251251
if (!err.empty()) {
@@ -2136,7 +2136,7 @@ bool CmdLineParser::loadCppcheckCfg()
21362136
std::list<FileWithDetails> CmdLineParser::filterFiles(const std::vector<std::string>& fileFilters,
21372137
const std::list<FileWithDetails>& filesResolved) {
21382138
std::list<FileWithDetails> files;
2139-
PathMatch filtermatcher(fileFilters);
2139+
PathMatch filtermatcher(fileFilters, Path::getCurrentPath());
21402140
std::copy_if(filesResolved.cbegin(), filesResolved.cend(), std::inserter(files, files.end()), [&](const FileWithDetails& entry) {
21412141
return filtermatcher.match(entry.path()) || filtermatcher.match(entry.spath());
21422142
});

‎gui/filelist.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ static std::vector<std::string> toStdStringList(const QStringList &stringList)
119119

120120
QStringList FileList::applyExcludeList() const
121121
{
122-
const PathMatch pathMatch(toStdStringList(mExcludedPaths));
122+
const PathMatch pathMatch(toStdStringList(mExcludedPaths), QDir::currentPath().toStdString());
123123

124124
QStringList paths;
125125
for (const QFileInfo& item : mFileList) {

‎lib/importproject.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
void ImportProject::ignorePaths(const std::vector<std::string> &ipaths, bool debug)
4747
{
48-
PathMatch matcher(ipaths);
48+
PathMatch matcher(ipaths, Path::getCurrentPath());
4949
for (auto it = fileSettings.cbegin(); it != fileSettings.cend();) {
5050
if (matcher.match(it->filename())) {
5151
if (debug)
@@ -840,7 +840,7 @@ bool ImportProject::importVcxproj(const std::string &filename, const tinyxml2::X
840840
}
841841

842842
// Project files
843-
PathMatch filtermatcher(fileFilters);
843+
PathMatch filtermatcher(fileFilters, Path::getCurrentPath());
844844
for (const std::string &cfilename : compileList) {
845845
if (!fileFilters.empty() && !filtermatcher.match(cfilename))
846846
continue;
@@ -920,7 +920,7 @@ ImportProject::SharedItemsProject ImportProject::importVcxitems(const std::strin
920920
SharedItemsProject result;
921921
result.pathToProjectFile = filename;
922922

923-
PathMatch filtermatcher(fileFilters);
923+
PathMatch filtermatcher(fileFilters, Path::getCurrentPath());
924924

925925
tinyxml2::XMLDocument doc;
926926
const tinyxml2::XMLError error = doc.LoadFile(filename.c_str());

‎lib/pathmatch.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class CPPCHECKLIB PathMatch {
8282
* @param basepath Path to which patterns and matched paths are relative, when applicable.
8383
* @param mode Case sensitivity mode.
8484
*/
85-
explicit PathMatch(std::vector<std::string> patterns, std::string basepath = std::string(), Mode mode = platform_mode);
85+
explicit PathMatch(std::vector<std::string> patterns = {}, std::string basepath = std::string(), Mode mode = platform_mode);
8686

8787
/**
8888
* @brief Match path against list of patterns.

‎lib/suppressions.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ SuppressionList::Suppression::Result SuppressionList::Suppression::isSuppressed(
397397
if (!errorId.empty() && !matchglob(errorId, errmsg.errorId))
398398
return Result::Checked;
399399
} else {
400-
if (!fileName.empty() && !PathMatch::match(fileName, errmsg.getFileName()))
400+
if (!fileName.empty() && !PathMatch::match(fileName, errmsg.getFileName(), std::string()))
401401
return Result::None;
402402
if ((SuppressionList::Type::unique == type) && (lineNumber != NO_LINE) && (lineNumber != errmsg.lineNumber)) {
403403
if (!thisAndNextLine || lineNumber + 1 != errmsg.lineNumber)

‎test/helpers.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ ScopedFile::~ScopedFile() {
8787
// TODO: simplify the function call
8888
// hack to be able to delete *.plist output files
8989
std::list<FileWithDetails> files;
90-
const std::string res = FileLister::addFiles(files, mPath, {".plist"}, false, PathMatch({}));
90+
const std::string res = FileLister::addFiles(files, mPath, {".plist"}, false, PathMatch());
9191
if (!res.empty()) {
9292
std::cout << "ScopedFile(" << mPath + ") - generating file list failed (" << res << ")" << std::endl;
9393
}

‎test/testfilelister.cpp‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ class TestFileLister : public TestFixture {
6060

6161
// Recursively add add files..
6262
std::list<FileWithDetails> files;
63-
PathMatch matcher({});
64-
std::string err = FileLister::recursiveAddFiles(files, adddir, {}, matcher);
63+
std::string err = FileLister::recursiveAddFiles(files, adddir, {}, PathMatch());
6564
ASSERT_EQUALS("", err);
6665

6766
ASSERT(!files.empty());
@@ -107,7 +106,7 @@ class TestFileLister : public TestFixture {
107106

108107
void recursiveAddFilesEmptyPath() const {
109108
std::list<FileWithDetails> files;
110-
const std::string err = FileLister::recursiveAddFiles(files, "", {}, PathMatch({}));
109+
const std::string err = FileLister::recursiveAddFiles(files, "", {}, PathMatch());
111110
ASSERT_EQUALS("no path specified", err);
112111
}
113112

@@ -125,8 +124,7 @@ class TestFileLister : public TestFixture {
125124
const std::string basedir = findBaseDir();
126125

127126
std::list<FileWithDetails> files;
128-
PathMatch matcher({});
129-
std::string err = FileLister::recursiveAddFiles(files, basedir + "lib/token.cpp", {}, matcher);
127+
std::string err = FileLister::recursiveAddFiles(files, basedir + "lib/token.cpp", {}, PathMatch());
130128
ASSERT_EQUALS("", err);
131129
ASSERT_EQUALS(1, files.size());
132130
ASSERT_EQUALS(basedir + "lib/token.cpp", files.begin()->path());
@@ -136,7 +134,7 @@ class TestFileLister : public TestFixture {
136134
const std::string basedir = findBaseDir() + ".";
137135

138136
std::list<FileWithDetails> files;
139-
PathMatch matcher({"lib/"}); // needs to end with slash so it matches directories - added by CmdLineParser
137+
PathMatch matcher({"lib/"});
140138
std::string err = FileLister::recursiveAddFiles(files, basedir, {}, matcher);
141139
ASSERT_EQUALS("", err);
142140
ASSERT(!files.empty());
@@ -159,27 +157,27 @@ class TestFileLister : public TestFixture {
159157

160158
{
161159
const std::string addfile = Path::join(Path::join(adddir, "cli"), "main.cpp");
162-
const std::string err = FileLister::addFiles(files, addfile, {}, true,PathMatch({}));
160+
const std::string err = FileLister::addFiles(files, addfile, {}, true,PathMatch());
163161
ASSERT_EQUALS("", err);
164162
}
165163
{
166164
const std::string addfile = Path::join(Path::join(adddir, "lib"), "token.cpp");
167-
const std::string err = FileLister::addFiles(files, addfile, {}, true,PathMatch({}));
165+
const std::string err = FileLister::addFiles(files, addfile, {}, true,PathMatch());
168166
ASSERT_EQUALS("", err);
169167
}
170168
{
171169
const std::string addfile = Path::join(Path::join(adddir, "cli"), "token.cpp"); // does not exist
172-
const std::string err = FileLister::addFiles(files, addfile, {}, true,PathMatch({}));
170+
const std::string err = FileLister::addFiles(files, addfile, {}, true,PathMatch());
173171
ASSERT_EQUALS("", err);
174172
}
175173
{
176174
const std::string addfile = Path::join(Path::join(adddir, "lib2"), "token.cpp"); // does not exist
177-
const std::string err = FileLister::addFiles(files, addfile, {}, true,PathMatch({}));
175+
const std::string err = FileLister::addFiles(files, addfile, {}, true,PathMatch());
178176
ASSERT_EQUALS("", err);
179177
}
180178
{
181179
const std::string addfile = Path::join(Path::join(adddir, "lib"), "matchcompiler.h");
182-
const std::string err = FileLister::addFiles(files, addfile, {}, true,PathMatch({}));
180+
const std::string err = FileLister::addFiles(files, addfile, {}, true,PathMatch());
183181
ASSERT_EQUALS("", err);
184182
}
185183

‎tools/dmake/dmake.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ static std::string getCppFiles(std::vector<std::string> &files, const std::strin
170170
std::list<FileWithDetails> filelist;
171171
const std::set<std::string> extra;
172172
const std::vector<std::string> masks;
173-
const PathMatch matcher(masks);
173+
const PathMatch matcher(masks, Path::getCurrentPath());
174174
std::string err = FileLister::addFiles(filelist, path, extra, recursive, matcher);
175175
if (!err.empty())
176176
return err;

0 commit comments

Comments
 (0)