Update rsync #2696
Merged
Update rsync #2696
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
This works by accident if $p evaluates to an empty string which is no longer the case when we add a PATCHURL.
Rsync might crash if we continue after a hard link failure. There is no reasonable way anyway, so just abort with recognizable error code. https://github.com/WayneD/rsync/issues/329 --- hlink.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hlink.c b/hlink.c index 66810a3e..23869872 100644 --- a/hlink.c +++ b/hlink.c @@ -464,7 +464,10 @@ int hard_link_one(struct file_struct *file, const char *fname, code = FERROR_XFER; rsyserr(code, errno, "link %s => %s failed", full_fname(fname), oldname); - return 0; + + /* This is broken beyond repair for --link-dest. No good way to continue here. */ + fprintf(stderr, "Aborting due to hard link failure\n"); + _exit(33); } file->flags |= FLAG_HLINK_DONE; -- 2.36.0
Sign in
to join this conversation on GitHub.
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.
This adds a patch to rsync, so that it doesn't run into undefined behavior if a hard link operation fails unexpectedly (eg, ext4 65000 hard links limit) but does a _exit(33) instead which can be recognized by pbackup.
https://github.com/WayneD/rsync/issues/329