beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-25 00:50:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

LibCore: Add support for monitoring symbolic links

Browse source 
Symbolic links are currently always followed to their target. This lets
us monitor the link file itself.
This commit is contained in:
Timothy Flynn 2024-08-23 14:27:44 -04:00 committed by Andreas Kling
parent 9f496a9c65
commit e25681203e
Notes: github-actions[bot] 2024-08-25 07:48:52 +00:00 
Author: https://github.com/trflynn89
Commit: https://github.com/LadybirdBrowser/ladybird/commit/e25681203ec
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/1182
3 changed files with 54 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
Tests/LibCore/TestLibCoreFileWatcher.cpp
View file

@ -107,3 +107,54 @@ TEST_CASE(contents_changed)
event_loop.exec();
}
TEST_CASE(symbolic_link)
{
auto event_loop = Core::EventLoop();
auto temp_path = MUST(FileSystem::real_path("/tmp"sv));
auto test_file = LexicalPath::join(temp_path, "testfile"sv);
auto test_link1 = LexicalPath::join(temp_path, "testlink1"sv);
auto test_link2 = LexicalPath::join(temp_path, "testlink2"sv);
(void)MUST(Core::File::open(test_link1.string(), Core::File::OpenMode::ReadWrite));
(void)MUST(Core::File::open(test_link2.string(), Core::File::OpenMode::ReadWrite));
MUST(Core::System::symlink(test_link1.string(), test_file.string()));
auto file_watcher = MUST(Core::FileWatcher::create());
MUST(file_watcher->add_watch(test_file.string(), Core::FileWatcherEvent::Type::Deleted | Core::FileWatcherEvent::Type::DoNotFollowLink));
int event_count = 0;
file_watcher->on_change = [&](Core::FileWatcherEvent const& event) {
EXPECT_EQ(event.event_path, test_file.string());
EXPECT(has_flag(event.type, Core::FileWatcherEvent::Type::Deleted));
MUST(file_watcher->add_watch(test_file.string(), Core::FileWatcherEvent::Type::Deleted | Core::FileWatcherEvent::Type::DoNotFollowLink));
if (++event_count == 2) {
MUST(Core::System::unlink(test_file.string()));
MUST(Core::System::unlink(test_link1.string()));
MUST(Core::System::unlink(test_link2.string()));
event_loop.quit(0);
}
};
auto timer1 = Core::Timer::create_single_shot(500, [&] {
MUST(Core::System::unlink(test_file.string()));
MUST(Core::System::symlink(test_link1.string(), test_file.string()));
});
timer1->start();
auto timer2 = Core::Timer::create_single_shot(1000, [&] {
MUST(Core::System::unlink(test_file.string()));
MUST(Core::System::symlink(test_link2.string(), test_file.string()));
});
timer2->start();
auto catchall_timer = Core::Timer::create_single_shot(2000, [&] {
VERIFY_NOT_REACHED();
});
catchall_timer->start();
event_loop.exec();
}

1
Userland/Libraries/LibCore/FileWatcher.h
View file

@ -25,6 +25,7 @@ struct FileWatcherEvent {
Deleted = 1 << 2,
ChildCreated = 1 << 3,
ChildDeleted = 1 << 4,
DoNotFollowLink = 1 << 5,
};
Type type { Type::Invalid };
ByteString event_path;

2
Userland/Libraries/LibCore/FileWatcherLinux.cpp
View file

@ -145,6 +145,8 @@ ErrorOr<bool> FileWatcherBase::add_watch(ByteString path, FileWatcherEvent::Type
inotify_mask |= IN_MODIFY;
if (has_flag(event_mask, FileWatcherEvent::Type::MetadataModified))
inotify_mask |= IN_ATTRIB;
if (has_flag(event_mask, FileWatcherEvent::Type::DoNotFollowLink))
inotify_mask |= IN_DONT_FOLLOW;
int watch_descriptor = ::inotify_add_watch(m_watcher_fd, path.characters(), inotify_mask);
if (watch_descriptor < 0)