wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-12-23 05:12:40 +03:00
Code Issues Projects Releases Wiki Activity

fixup build on windows, and update tests

Browse Source
This commit is contained in:
Wez Furlong 2021-03-27 20:40:40 -07:00
parent 12225a099a
commit 99131a2a98
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
filedescriptor/src/windows.rs
View File

@ -87,6 +87,7 @@ impl<T: FromRawSocket> FromRawSocketDescriptor for T {
} }
unsafe impl Send for OwnedHandle {} unsafe impl Send for OwnedHandle {}
unsafe impl Sync for OwnedHandle {}
impl OwnedHandle { impl OwnedHandle {
fn probe_handle_type_if_unknown(handle: RawHandle, handle_type: HandleType) -> HandleType { fn probe_handle_type_if_unknown(handle: RawHandle, handle_type: HandleType) -> HandleType {

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

@ -491,6 +491,7 @@ Config {
r#" r#"
{ {
"hostname": "random", "hostname": "random",
"identityfile": "/home/me/.ssh/id_dsa /home/me/.ssh/id_ecdsa /home/me/.ssh/id_ed25519 /home/me/.ssh/id_rsa",
"port": "22", "port": "22",
"something": "first", "something": "first",
"user": "me", "user": "me",
@ -521,6 +522,7 @@ Config {
r#" r#"
{ {
"hostname": "a.b", "hostname": "a.b",
"identityfile": "/home/me/.ssh/id_dsa /home/me/.ssh/id_ecdsa /home/me/.ssh/id_ed25519 /home/me/.ssh/id_rsa",
"port": "22", "port": "22",
"something": "first", "something": "first",
"user": "me", "user": "me",
@ -537,6 +539,7 @@ Config {
"forwardagent": "no", "forwardagent": "no",
"hostname": "b.b", "hostname": "b.b",
"identityagent": "/home/me/.ssh/agent", "identityagent": "/home/me/.ssh/agent",
"identityfile": "/home/me/.ssh/id_dsa /home/me/.ssh/id_ecdsa /home/me/.ssh/id_ed25519 /home/me/.ssh/id_rsa",
"port": "22", "port": "22",
"something": "first", "something": "first",
"user": "me", "user": "me",

1
wezterm-ssh/src/pty.rs
View File

@ -75,6 +75,7 @@ impl portable_pty::MasterPty for SshPty {
.map(|f| -> Box<(dyn Write + Send + 'static)> { Box::new(f) }) .map(|f| -> Box<(dyn Write + Send + 'static)> { Box::new(f) })
} }
#[cfg(unix)]
fn process_group_leader(&self) -> Option<i32> { fn process_group_leader(&self) -> Option<i32> {
// It's not local, so there's no meaningful leader // It's not local, so there's no meaningful leader
None None