walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

FileLister (linux): Refactor code to keep only one list of seen directory entries 

The list contains filenames and directories now
and is only used for duplicate detection.
This commit is contained in:
Thomas Jarosch 2011-10-29 19:57:12 +02:00
parent a809bb3471
commit 09bdacf31f
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cli/filelister.cpp
View File

@ -276,8 +276,7 @@ std::string FileLister::getAbsolutePath(const std::string& path)
}
void FileLister::recursiveAddFiles2(std::vector<std::string> &relative,
std::vector<std::string> &absolute,
std::set<std::string> &seen_dirs,
std::set<std::string> &seen_paths,
std::map<std::string, long> &filesizes,
const std::string &path)
{
@ -298,16 +297,17 @@ void FileLister::recursiveAddFiles2(std::vector<std::string> &relative,
if (absolute_path.empty())
continue;
// Did we already process this entry?
if (seen_paths.find(absolute_path) != seen_paths.end())
continue;
if (filename[filename.length()-1] != '/') {
// File
// Did we already see this file? Then bail out
if (std::find(absolute.begin(), absolute.end(), absolute_path) != absolute.end())
continue;
if (Path::sameFileName(path,filename) || FileLister::acceptFile(filename)) {
relative.push_back(filename);
absolute.push_back(absolute_path);
seen_paths.insert(absolute_path);
struct stat sb;
if (stat(absolute_path.c_str(), &sb) == 0) {
// Limitation: file sizes are assumed to fit in a 'long'
@ -317,12 +317,8 @@ void FileLister::recursiveAddFiles2(std::vector<std::string> &relative,
} else {
// Directory
// Check if we already seen this part of the directory tree (cyclic symbolic links)
if (seen_dirs.find(absolute_path) != seen_dirs.end())
continue;
seen_dirs.insert(absolute_path);
recursiveAddFiles2(relative, absolute, seen_dirs, filesizes, filename);
seen_paths.insert(absolute_path);
recursiveAddFiles2(relative, seen_paths, filesizes, filename);
}
}
globfree(&glob_results);
@ -331,9 +327,8 @@ void FileLister::recursiveAddFiles2(std::vector<std::string> &relative,
void FileLister::recursiveAddFiles(std::vector<std::string> &filenames, std::map<std::string, long> &filesizes, const std::string &path)
{
std::vector<std::string> abs;
std::set<std::string> seen_dirs;
recursiveAddFiles2(filenames, abs, seen_dirs, filesizes, path);
std::set<std::string> seen_paths;
recursiveAddFiles2(filenames, seen_paths, filesizes, path);
}
bool FileLister::isDirectory(const std::string &path)

3
cli/filelister.h
View File

@ -67,8 +67,7 @@ public:
static std::string getAbsolutePath(const std::string& path);
static void recursiveAddFiles2(std::vector<std::string> &relative,
std::vector<std::string> &absolute,
std::set<std::string> &seen_dirs,
std::set<std::string> &seen_paths,
std::map<std::string, long> &filesizes,
const std::string &path);
#endif