walk up symlink tree

"reload_style_on_change" would check if the target file is a symlink,
but only resolves the first link. If the symlink is acutally a chain of
symlink, such as what happens with NixOS's mkOutOfStoreSymlink, we will
not find the actual file style file.

Update the symlink resolution logic to walk down the symlink chain until
it finds a non-symlink. Also check against a the original filename
(which may be a symlink) to guard against infinitely looping on a
circular symlink chain.
This commit is contained in:
DomCristaldi 2024-07-20 22:58:03 -04:00
parent cb8fc1c10d
commit 58e21e876e
1 changed files with 7 additions and 1 deletions

View File

@ -43,8 +43,14 @@ std::string waybar::CssReloadHelper::findPath(const std::string& filename) {
}
// File monitor does not work with symlinks, so resolve them
if (std::filesystem::is_symlink(result)) {
std::string original = result;
while(std::filesystem::is_symlink(result)) {
result = std::filesystem::read_symlink(result);
// prevent infinite cycle
if (result == original) {
break;
}
}
return result;