fix(scp): Use less escaping for filenames when not needed - #1701
Open
yedayak wants to merge 1 commit into
Open
Conversation
akinomyoga
reviewed
Jul 28, 2026
| !(*:*)/* | [.~]*) ;; # looks like a path | ||
| *:*) | ||
| _comp_xfunc_scp_compgen_remote_files | ||
| # if scp supports "-O", which forces legacy scp/rcp protocols, |
Collaborator
There was a problem hiding this comment.
I haven't checked the behavior, but I have a naive question. When the user specifies the -O option to scp, does it change the number of required escapes? In such a case, should we use the legacy quoting even for the newer versions of scp?
OpenSSH 9.0 changed the default protocol the "scp" command uses to sftp, which needs less escaping for special characters in remote filenames. Check if the command has the option to use the legacy protocol and do less escaping. If the command line has the "-O" option to use the legacy protocol, we revert to the old behaviour. The extra escaping is necessary for older versions, so we can't do it unconditionally. Fixes: scop#1540
yedayak
commented
Jul 30, 2026
| bash, r"ssh() { printf '%s\n' 'abc def.txt' 'abc\ def.txt'; }" | ||
| ) | ||
| completion = assert_complete(bash, "scp remote_host:abc\\") | ||
| completion_legacy_proto = assert_complete( |
Collaborator
Author
There was a problem hiding this comment.
I don't love this, but I think its better than having completely separate tests for -O. Open to other suggestions
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
2 participants
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.
fix(scp): Use less escaping for filenames when not needed
OpenSSH 9.0 changed the default protocol the "scp" command uses to
sftp, which needs less escaping for special characters in remote
filenames. Check if the command has the option to use the legacy
protocol and do less escaping.
If the command line has the "-O" option to use the legacy protocol,
we revert to the old behaviour.
The extra escaping is necessary for older versions, so we can't do it
unconditionally.
Fixes: #1540