wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-09-20 03:09:06 +03:00
Code Issues Projects Releases Wiki Activity

ssh: Host is space delimited, not comma delimited

Browse Source 
closes: #1196
This commit is contained in:
Wez Furlong 2021-10-03 08:09:04 -07:00
parent 9a78754961
commit 8da9196491
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changelog.md
View File

@ -54,6 +54,7 @@ As features stabilize some brief notes about them will accumulate here.
* New: `wezterm connect` now also supports the `--class` parameter to override the window class
* Fixed: wezterm can now match bitmap fonts that are spread across multiple font files [#1189](https://github.com/wez/wezterm/issues/1189)
* Improved: [use_cap_height_to_scale_fallback_fonts](config/lua/config/use_cap_height_to_scale_fallback_fonts.md) now computes *cap-height* based on the rasterized glyph bitmap which means that the data is accurate in more cases, including for bitmap fonts. Scaling is now also applied to across varying text styles; previously it only applied to a font within an `wezterm.font_with_fallback` font list.
* Fixed: ssh config parser incorrectly split `Host` patterns with commas instead of whitespace [#1196](https://github.com/wez/wezterm/issues/1196)
### 20210814-124438-54e29167

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

@ -236,6 +236,18 @@ impl ParsedConfigFile {
}
patterns
}
fn parse_whitespace_pattern_list(v: &str) -> Vec<Pattern> {
let mut patterns = vec![];
for p in v.split_ascii_whitespace() {
let p = p.trim();
if p.starts_with('!') {
patterns.push(Pattern::new(&p[1..], true));
} else {
patterns.push(Pattern::new(p, false));
}
}
patterns
}
if k == "include" {
Self::do_include(v, cwd, options, groups);
@ -243,7 +255,7 @@ impl ParsedConfigFile {
}
if k == "host" {
let patterns = parse_pattern_list(v);
let patterns = parse_whitespace_pattern_list(v);
groups.push(MatchGroup {
criteria: vec![Criteria::Host(patterns)],
options: ConfigMap::new(),
@ -1026,11 +1038,11 @@ Config {
Something first
# the prior Something takes precedence
Something ignored
Host 192.168.1.8,wopr
Host 192.168.1.8 wopr
FowardAgent yes
IdentityFile "%d/.ssh/id_pub.dsa"
Host !a.b,*.b
Host !a.b *.b
ForwardAgent no
IdentityAgent "${HOME}/.ssh/agent"