Preserve raw filename bytes in trashinfo Path entries#387
Open
SOV710 wants to merge 2 commits into
Open
Conversation
This file contains hidden or 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
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.
Summary
Fix
.trashinfoPath=handling for filenames that are valid filesystem byte sequences but not valid UTF-8.trash-putcan now trash files with names such asb'\xa4-\xc8\xcf-\xc1+\xb8.txt'without losing the original filename bytes.Bug
trash-putpreviously percent-encodedPath=from a Python text string. On Python 3, non-UTF-8 filenames are represented with surrogate escapes, and trying to encode those surrogates as UTF-8 can raiseUnicodeEncodeErrorwhile generating the.trashinfofile.This means a file can exist on disk and be passable to
os.*, but still fail duringtrash-put.Reproduction
Then pass the printed filename to:
trash-put ''
Before this PR, trash-put could fail while writing the .trashinfo metadata.
Fix
This PR makes .trashinfo path encoding byte-preserving:
This keeps .trashinfo contents UTF-8-compatible while preserving the original filesystem bytes.
Tests
Added coverage for:
Verified with: