Correct file size calculation

amai2012 · amai2012 · commit 52d042fd48cc · 2018-11-30T23:18:51.000+01:00
diff --git a/cli/filelister.cpp b/cli/filelister.cpp
@@ -186,13 +186,11 @@ static void addFiles2(std::map<std::string, std::size_t> &files,
     if (stat(path.c_str(), &file_stat) != -1) {
         if ((file_stat.st_mode & S_IFMT) == S_IFDIR) {
             DIR * dir = opendir(path.c_str());
-
             if (!dir)
                 return;
 
             dirent entry;
             dirent * dir_result;
-
             std::string new_path;
             new_path.reserve(path.length() + 100);// prealloc some memory to avoid constant new/deletes in loop
 
@@ -210,6 +208,7 @@ static void addFiles2(std::map<std::string, std::size_t> &files,
                     }
                 } else {
                     if (Path::acceptFile(new_path, extra) && !ignored.match(new_path)) {
+                        stat(new_path.c_str(), &file_stat);
                         files[new_path] = file_stat.st_size;
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -186,13 +186,11 @@ static void addFiles2(std::map<std::string, std::size_t> &files,`
`186`	`186`	`if (stat(path.c_str(), &file_stat) != -1) {`
`187`	`187`	`if ((file_stat.st_mode & S_IFMT) == S_IFDIR) {`
`188`	`188`	`DIR * dir = opendir(path.c_str());`
`189`		`-`
`190`	`189`	`if (!dir)`
`191`	`190`	`return;`
`192`	`191`
`193`	`192`	`dirent entry;`
`194`	`193`	`dirent * dir_result;`
`195`		`-`
`196`	`194`	`std::string new_path;`
`197`	`195`	`new_path.reserve(path.length() + 100);// prealloc some memory to avoid constant new/deletes in loop`
`198`	`196`
`@@ -210,6 +208,7 @@ static void addFiles2(std::map<std::string, std::size_t> &files,`
`210`	`208`	`}`
`211`	`209`	`} else {`
`212`	`210`	`if (Path::acceptFile(new_path, extra) && !ignored.match(new_path)) {`
	`211`	`+ stat(new_path.c_str(), &file_stat);`
`213`	`212`	`files[new_path] = file_stat.st_size;`
`214`	`213`	`}`
`215`	`214`	`}`