oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

db/update/InotifyUpdate: use class DirectoryReader

Browse Source
This commit is contained in:
Max Kellermann 2020-09-16 20:51:18 +02:00
parent bf97ebf89f
commit 83f9d2a963
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/db/update/InotifyUpdate.cxx
View File

@ -23,8 +23,10 @@
#include "InotifyDomain.hxx" #include "InotifyDomain.hxx"
#include "storage/StorageInterface.hxx" #include "storage/StorageInterface.hxx"
#include "fs/AllocatedPath.hxx" #include "fs/AllocatedPath.hxx"
#include "fs/DirectoryReader.hxx"
#include "fs/FileInfo.hxx" #include "fs/FileInfo.hxx"
#include "fs/Traits.hxx" #include "fs/Traits.hxx"
#include "util/Compiler.h"
#include "Log.hxx" #include "Log.hxx"
#include <cassert> #include <cassert>
@ -145,19 +147,18 @@ WatchDirectory::GetUriFS() const noexcept
} }
/* we don't look at "." / ".." nor files with newlines in their name */ /* we don't look at "." / ".." nor files with newlines in their name */
static bool skip_path(const char *path) gcc_pure
static bool
SkipFilename(Path name) noexcept
{ {
return PathTraitsFS::IsSpecialFilename(path) || return PathTraitsFS::IsSpecialFilename(name.c_str()) ||
std::strchr(path, '\n') != nullptr; name.HasNewline();
} }
static void static void
recursive_watch_subdirectories(WatchDirectory &parent, recursive_watch_subdirectories(WatchDirectory &parent,
const AllocatedPath &path_fs, unsigned depth) const AllocatedPath &path_fs, unsigned depth)
{ try {
DIR *dir;
struct dirent *ent;
assert(depth <= inotify_max_depth); assert(depth <= inotify_max_depth);
assert(!path_fs.IsNull()); assert(!path_fs.IsNull());
@ -166,20 +167,14 @@ recursive_watch_subdirectories(WatchDirectory &parent,
if (depth > inotify_max_depth) if (depth > inotify_max_depth)
return; return;
dir = opendir(path_fs.c_str()); DirectoryReader dir(path_fs);
if (dir == nullptr) { while (dir.ReadEntry()) {
FormatErrno(inotify_domain,
"Failed to open directory %s", path_fs.c_str());
return;
}
while ((ent = readdir(dir))) {
int ret; int ret;
if (skip_path(ent->d_name)) const Path name_fs = dir.GetEntry();
if (SkipFilename(name_fs))
continue; continue;
const auto name_fs = Path::FromFS(ent->d_name);
const auto child_path_fs = path_fs / name_fs; const auto child_path_fs = path_fs / name_fs;
FileInfo fi; FileInfo fi;
@ -217,8 +212,8 @@ recursive_watch_subdirectories(WatchDirectory &parent,
recursive_watch_subdirectories(*child, child_path_fs, depth); recursive_watch_subdirectories(*child, child_path_fs, depth);
} }
} catch (...) {
closedir(dir); LogError(std::current_exception());
} }
gcc_pure gcc_pure