From 3ed26e7bb295b5f938f8218171ee678f683ecf4b Mon Sep 17 00:00:00 2001 From: Martin Stein Date: Sun, 14 Mar 2021 08:52:15 +0100 Subject: [PATCH] fs_query: watch only readable files The fs_query component used to try watching all files it found resulting in errors on files that are not watchable. For some files, however, the watch- feature doesn't make sense as they are not readable (no content, no size). Now, fs_query will check first whether a file is readable and skip watching if it isn't. Ref #4032 --- repos/gems/src/app/fs_query/main.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/repos/gems/src/app/fs_query/main.cc b/repos/gems/src/app/fs_query/main.cc index b3629736f6..9a5b5a1449 100644 --- a/repos/gems/src/app/fs_query/main.cc +++ b/repos/gems/src/app/fs_query/main.cc @@ -46,11 +46,16 @@ struct Fs_query::Watched_file Node_rwx const _rwx; - Watcher _watcher; + Constructible _watcher { }; Watched_file(Directory const &dir, File_content::Path name, Node_rwx rwx, Vfs::Watch_response_handler &handler) - : _name(name), _rwx(rwx), _watcher(dir, name, handler) { } + : + _name(name), _rwx(rwx) + { + if (_rwx.readable) + _watcher.construct(dir, name, handler); + } virtual ~Watched_file() { }