wezterm-ssh: add support for comments in Match statements
#5779
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
Looking at the openssh-portable code, it seems that inline comments are only handled specially on `Match` and `ProxyJump` statements. This change adds inline comment handling. Closes: wez#5498 See-also: https://github.com/openssh/openssh-portable/blob/ee6b9e661633fcefd29dba0c811cecbc4d027f6f/readconf.c#L652 Signed-off-by: Hank Donnay <[email protected]>
wez
reviewed
Jul 13, 2024
| @@ -293,7 +295,14 @@ impl ParsedConfigFile { | |||
| let mut criteria = vec![]; | |||
| let mut context = Context::FirstPass; | |||
|
|
|||
| let mut tokens = v.split_ascii_whitespace(); | |||
| let mut tokens = v.split_ascii_whitespace().map_while(|tok| { | |||
There was a problem hiding this comment.
Hmm, I don't think this works as you intend, because I think this results in ignoring only the # fun token but not the games token from your expanded test case?
A more robust alternative would be to do something like:
let v, _commented = v.split_once('#').unwrap_or(v);
let mut tokens = v.split_ascii_whitespace();Please expand the test case to explicitly verify the effective values for the games host so that we can prove/disprove this.
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.
Looking at the openssh-portable code, it seems that inline comments are only handled specially on
MatchandProxyJumpstatements. This change adds inline comment handling.Closes: #5498
See-also: https://github.com/openssh/openssh-portable/blob/ee6b9e661633fcefd29dba0c811cecbc4d027f6f/readconf.c#L652