conf: fix reloading on IN_CREATE #2215
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ammen99
reviewed
Mar 13, 2024
|
The issue was a little less subtle than I thought; the new commit should fix it. Thanks :) |
|
Please also fix the code style (https://github.com/WayfireWM/wayfire/actions/runs/8317772853/job/22774734664?pr=2215#step:8:1) |
If the config file is a symlink, wayfire attempts to watch the parent directory so that, if replaced via a subsequent `ln -sf`, it'll still be notified. When notified, however, wayfire doesn't immediately reload the config file. Rather, as this event may be triggered by any file creation in the directory, we first make sure that the config file really is the one being created anew. Unfortunately, ln -sf is special: It'll create a randomly named file in the directory before renameat(2)ing it to the proper location. So it does generate an IN_CREATE event, but to know that the file was changed, we need to additionally monitor for IN_MOVED_TO. Fixes WayfireWM#2210.
Oops, thanks :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See the linked issue for context.
This is a strange bug, and I honestly don't know why this fix works (or, rather, why the original code was buggy). I wrote some smaller test programs, and
operator==generally does seem to work over a flexible array member. I may be missing something obvious, or there may be some UB going on when->nameis inspected in the buffer returned fromread(2). In any case, this fix appears to work, though I'd like some external confirmation or refutation of that given how shaky it seems. Thanks!Commit message below: