mawei/openpilot-meb
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix: util::read_files_in_dir does not always return a correct result (#21883)

Browse Source 
* fix bug

* use de->d_type==DT_REG

* Revert "use de->d_type==DT_REG"

This reverts commit ecb38c82305ea23bfec84284aa77be5b5c64957a.
old-commit-hash: 83710b14ee8cf043576dba8f3707fc585067167e
This commit is contained in:
Dean Lee
2021-09-02 06:10:59 +08:00
committed by GitHub
parent 2e285bea20
commit 48b7754ab5
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
selfdrive/common/tests/test_util.cc
View File

@@ -75,3 +75,20 @@ TEST_CASE("util::file_exists") {
}
::remove(filename);
}
TEST_CASE("util::read_files_in_dir") {
char tmp_path[] = "/tmp/test_XXXXXX";
const std::string test_path = mkdtemp(tmp_path);
const std::string files[] = {".test1", "'test2'", "test3"};
for (auto fn : files) {
std::ofstream{test_path + "/" + fn} << fn;
}
mkdir((test_path + "/dir").c_str(), 0777);
std::map<std::string, std::string> result = util::read_files_in_dir(test_path);
REQUIRE(result.find("dir") == result.end());
REQUIRE(result.size() == std::size(files));
for (auto& [k, v] : result) {
REQUIRE(k == v);
}
}

2
selfdrive/common/util.cc
View File

@@ -85,7 +85,7 @@ std::map<std::string, std::string> read_files_in_dir(const std::string &path) {
struct dirent *de = NULL;
while ((de = readdir(d))) {
if (isalnum(de->d_name[0])) {
if (de->d_type != DT_DIR) {
ret[de->d_name] = util::read_file(path + "/" + de->d_name);
}
}