jianf/HomeAgent
1
0
Fork 0
mirror of https://gitcode.com/JianFeeeee/HomeAgent.git synced 2026-09-22 01:48:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: waiter Ctrl+C not responding in interactive mode

Browse Source 
rawmode_linux.go only cleared ICANON|ECHO but left ISIG enabled,
so the terminal driver caught Ctrl+C and generated SIGINT.
signal.Notify caught the SIGINT but no goroutine consumed the
channel, effectively swallowing the signal.

Fix: also clear ISIG so Ctrl+C is delivered as byte 0x03,
which the line editor handles with os.Exit(130). Also set
VMIN=1, VTIME=0 for proper blocking read behavior.
This commit is contained in:
jianf
2026-07-19 12:25:21 +08:00
parent 9cc8176a53
commit 22c62e26ff
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/waiter/rawmode_defs.go
View File

@ -15,4 +15,7 @@ const (
TCSETS = 0x5402 TCSETS = 0x5402
ICANON = 0x2 ICANON = 0x2
ECHO = 0x8 ECHO = 0x8
ISIG = 0x1
VMIN = 6
VTIME = 5
) )

4
cmd/waiter/rawmode_linux.go
View File

@ -13,7 +13,9 @@ func setRawMode(fd int) (func(), error) {
return func() {}, err return func() {}, err
} }
new := old new := old
new.Lflag &^= ICANON | ECHO new.Lflag &^= ICANON | ECHO | ISIG
new.Cc[VMIN] = 1
new.Cc[VTIME] = 0
if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, uintptr(fd), TCSETS, uintptr(unsafe.Pointer(&new))); err != 0 { if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, uintptr(fd), TCSETS, uintptr(unsafe.Pointer(&new))); err != 0 {
return func() {}, err return func() {}, err
} }