wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-08-16 17:50:28 +03:00
Code Issues Projects Releases Wiki Activity

wezterm-ssh: add support for comments in Match statements

Browse Source 
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: #5498
See-also: ee6b9e6616/readconf.c (L652)
Signed-off-by: Hank Donnay <hdonnay@gmail.com>
This commit is contained in:
Hank Donnay 2024-07-03 15:24:56 -05:00
parent 69686f4564
commit 949d503e3b
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wezterm-ssh/src/config.rs
View File

@ -237,6 +237,8 @@ impl ParsedConfigFile {
if line.is_empty() || line.starts_with('#') {
continue;
}
// Only `Match` and `ProxyJump` options seem to allow inline comments.
// The latter is not handled.
if let Some(sep) = line.find(|c: char| c == '=' || c.is_whitespace()) {
let (k, v) = line.split_at(sep);
@ -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| {
// This is for compatability, see `match_cfg_line` in openssh's `readconf.c`.
if tok.starts_with("#") {
None
} else {
Some(tok)
}
});
while let Some(cname) = tokens.next() {
match cname.to_lowercase().as_str() {
@ -1080,7 +1089,7 @@ Config {
Something first
# the prior Something takes precedence
Something ignored
Match Host 192.168.1.8,wopr
Match Host 192.168.1.8,wopr # fun games
FowardAgent yes
IdentityFile "%d/.ssh/id_pub.dsa"