StarMirror/sandboxed-api
1
0
Fork 0
mirror of https://github.com/google/sandboxed-api.git synced 2024-03-22 13:11:30 +08:00
Code Issues Projects Releases Wiki Activity

Replace deprecated readdir64_r

Browse Source 
Plain `readdir` is preferred and while not (yet) specified in POSIX it is thread-safe for different directory streams in popular implementations.

PiperOrigin-RevId: 423321528
Change-Id: I4e1e842f338ff7d690c36e7f699b2f3637609524
This commit is contained in:
Wiktor Garbacz 2022-01-21 07:48:14 -08:00 committed by Copybara-Service
parent 6fd650b736
commit 3c16be8347
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sandboxed_api/util/fileops.cc
View File

@ -205,16 +205,9 @@ bool ListDirectoryEntries(const std::string& directory,
return false; return false;
} }
struct dirent64* entry{};
errno = 0; errno = 0;
int bufferlen = struct dirent* entry;
std::max<int>(offsetof(struct dirent64, d_name) + while ((entry = readdir(dir.get())) != nullptr) {
pathconf(directory.c_str(), _PC_NAME_MAX) + 1,
sizeof(struct dirent64));
std::unique_ptr<struct dirent64, void (*)(struct dirent64*)> dirent_buffer{
static_cast<struct dirent64*>(malloc(bufferlen)),
[](struct dirent64* p) { free(p); }};
while (readdir64_r(dir.get(), dirent_buffer.get(), &entry) == 0 && entry) {
const std::string name(entry->d_name); const std::string name(entry->d_name);
if (name != "." && name != "..") { if (name != "." && name != "..") {
entries->push_back(name); entries->push_back(name);