gitea-mirror/git-crypt
1
0
Fork 0
mirror of https://github.com/AGWA/git-crypt.git synced 2026-01-02 16:20:16 -08:00
Code Issues Packages Projects Releases Wiki Activity

Clean up readdir code, add a comment about why we're using readdir

Browse Source
This commit is contained in:
Andrew Ayer
2017-09-10 12:33:18 -07:00
parent 0e4ad51a13
commit f03fdc6ad0
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
util-unix.cpp
View File

@@ -188,17 +188,22 @@ std::vector<std::string> get_directory_contents (const char* path)
throw System_error("opendir", path, errno);
}
try {
struct dirent* ent = NULL;
errno = 0;
while((ent = readdir(dir)) != NULL && errno == 0) {
if (std::strcmp(ent->d_name, ".") && std::strcmp(ent->d_name, ".."))
// Note: readdir is reentrant in new implementations. In old implementations,
// it might not be, but git-crypt isn't multi-threaded so that's OK.
// We don't use readdir_r because it's buggy and deprecated:
// https://womble.decadent.org.uk/readdir_r-advisory.html
// http://austingroupbugs.net/view.php?id=696
// http://man7.org/linux/man-pages/man3/readdir_r.3.html
while (struct dirent* ent = readdir(dir)) {
if (!(std::strcmp(ent->d_name, ".") == 0 || std::strcmp(ent->d_name, "..") == 0)) {
contents.push_back(ent->d_name);
}
}
if(errno)
if (errno) {
throw System_error("readdir", path, errno);
}
} catch (...) {
closedir(dir);