twin/hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2025-08-03 05:31:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

configWatcher: watch both symlinks and canonical paths (#9219)

Browse Source
This commit is contained in:
Mihai Fufezan
2025-01-31 15:36:22 +02:00
committed by GitHub
parent 9c38287410
commit 12b5034c99
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/config/ConfigWatcher.cpp
View File

@@ -4,6 +4,7 @@
#include <ranges> #include <ranges>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <filesystem>
using namespace Hyprutils::OS; using namespace Hyprutils::OS;
@@ -43,9 +44,19 @@ void CConfigWatcher::setWatchList(const std::vector<std::string>& paths) {
// add new paths // add new paths
for (const auto& path : paths) { for (const auto& path : paths) {
m_watches.emplace_back(SInotifyWatch{ m_watches.emplace_back(SInotifyWatch{
.wd = inotify_add_watch(m_inotifyFd.get(), path.c_str(), IN_MODIFY), .wd = inotify_add_watch(m_inotifyFd.get(), path.c_str(), IN_MODIFY | IN_DONT_FOLLOW),
.file = path, .file = path,
}); });
std::error_code ec, ec2;
const auto CANONICAL = std::filesystem::canonical(path, ec);
const auto IS_SYMLINK = std::filesystem::is_symlink(path, ec2);
if (!ec && !ec2 && IS_SYMLINK) {
m_watches.emplace_back(SInotifyWatch{
.wd = inotify_add_watch(m_inotifyFd.get(), CANONICAL.c_str(), IN_MODIFY),
.file = path,
});
}
} }
} }