mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-06-08 22:28:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression that broke quick exit from ssh kitten

Browse Source
This commit is contained in:
Kovid Goyal
2023-11-06 21:22:41 +05:30
parent ac2ec44a7f
commit bd5fcb00e0
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
kittens/ssh/main.go
View File

@@ -524,16 +524,20 @@ func get_remote_command(cd *connection_data) error {
return nil
}
var debugprintln = tty.DebugPrintln
var _ = debugprintln
func drain_potential_tty_garbage(term *tty.Term) {
err := term.ApplyOperations(tty.TCSANOW, tty.SetNoEcho)
err := term.ApplyOperations(tty.TCSANOW, tty.SetRaw)
if err != nil {
return
}
canary, err := secrets.TokenBase64()
canary, err := secrets.TokenHex()
if err != nil {
return
}
dcs, err := tui.DCSToKitty("echo", canary+"\n\r")
dcs, err := tui.DCSToKitty("echo", canary)
q := utils.UnsafeStringToBytes(canary)
if err != nil {
return
}
@@ -541,7 +545,6 @@ func drain_potential_tty_garbage(term *tty.Term) {
if err != nil {
return
}
q := utils.UnsafeStringToBytes(canary)
data := make([]byte, 0)
give_up_at := time.Now().Add(2 * time.Second)
buf := make([]byte, 0, 8192)
@@ -553,7 +556,7 @@ func drain_potential_tty_garbage(term *tty.Term) {
}
n, err := term.ReadWithTimeout(buf, timeout)
if err != nil {
return
break
}
data = append(data, buf[:n]...)
}