Skip to content

Remove readdir_r in favor of readdir #422

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

Merged
RomanDzhabarov merged 1 commit into from
Feb 6, 2017
Merged

Remove readdir_r in favor of readdir #422

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
21 changes: 10 additions & 11 deletions source/common/runtime/runtime_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,30 +75,29 @@ uint64_t SnapshotImpl::getInteger(const std::string& key, uint64_t default_value
void SnapshotImpl::walkDirectory(const std::string& path, const std::string& prefix) {
log_debug("walking directory: {}", path);
Directory current_dir(path);
dirent entry;
dirent* result;
while (true) {
int rc = readdir_r(current_dir.dir_, &entry, &result);
if (0 != rc) {
errno = 0;
dirent* entry = readdir(current_dir.dir_);
if (entry == nullptr && errno != 0) {
throw EnvoyException(fmt::format("unable to iterate directory: {}", path));
}

if (!result) {
if (entry == nullptr) {
break;
}

std::string full_path = path + "/" + entry.d_name;
std::string full_path = path + "/" + entry->d_name;
std::string full_prefix;
if (prefix.empty()) {
full_prefix = entry.d_name;
full_prefix = entry->d_name;
} else {
full_prefix = prefix + "." + entry.d_name;
full_prefix = prefix + "." + entry->d_name;
}

if (entry.d_type == DT_DIR && std::string(entry.d_name) != "." &&
std::string(entry.d_name) != "..") {
if (entry->d_type == DT_DIR && std::string(entry->d_name) != "." &&
std::string(entry->d_name) != "..") {
walkDirectory(full_path, full_prefix);
} else if (entry.d_type == DT_REG) {
} else if (entry->d_type == DT_REG) {
// Suck the file into a string. This is not very efficient but it should be good enough
// for small files. Also, as noted elsewhere, none of this is non-blocking which could
// theoretically lead to issues.
Expand Down