fix: stdin handling and exit command (#58)
### Summary of Changes Fixes **#53** (*Fish shell integration panics with `inappropriate ioctl for device`*). #### 1. Fixed Non-TTY Stdin (`panic: inappropriate ioctl for device`) — Fixes #53 - **Root Cause**: When executing `iris init fish | source` (or sourcing shell configs), `os.Stdin` (FD 0) is connected to a pipe instead of a TTY. Calling `term.MakeRaw()` on a pipe returns `ENOTTY`. - **Fix**: Guarded `term.MakeRaw()` with `term.IsTerminal()` checks across `root/wrapper.go` and `root/root.go`. Added fallback to open and use `/dev/tty` when `os.Stdin` is not a terminal device. - **Fish IPC Hooks**: Added `fish_preexec` and `fish_postexec` event handlers to `iris init fish` to send `IRIS_CMD_START` / `IRIS_CMD_STOP` IPC signals over `$IRIS_FD`. #### 2. Fixed Shell Setup Order (Duplicate `fastfetch` / startup executions) — Fixes #53 - **Root Cause**: `iris setup` appended the init script to the bottom of shell configs (`config.fish`, `.zshrc`, `.bashrc`), causing pre-existing interactive startup commands to run twice. - **Fix**: Updated `setupCmd` in `root/init.go` to **prepend** `# Iris Autocomplete` to the top of shell configuration files. #### 3. Fixed Terminal Exit Loop Handling — Relates to #50 - **Root Cause**: When typing `exit` in the wrapped shell, Linux PTY returns `syscall.EIO` (`Input/output error`) on `ptmx.Read()` rather than `io.EOF`. `runWrapper()` was ignoring non-EOF errors and looping indefinitely without restoring the terminal or calling `os.Exit(0)`. - **Fix**: Updated the `ptmx.Read` error handler in `root/wrapper.go` to handle `syscall.EIO` and exit cleanly. --- ### Issues Addressed - Closes #53 - Relates to #50, #55 --- ### Verification Tested - [x] Verified `iris setup fish` / `iris init fish | source` initializes without `ioctl` panic. - [x] Verified typing `exit` in Fish, Zsh, and Bash terminates IRIS cleanly and restores standard terminal state. - [x] Ran `go test ./...` — all tests pass. --------- Co-authored-by: verse91 <versedev.store@proton.me> Co-authored-by: VERSE <sunnyone0901@gmail.com>
This commit is contained in:
co-authored by
verse91
VERSE
parent
d6cfb9c909
commit
d73921e419
+17
-6
@@ -80,10 +80,21 @@ func runWatchdog() {
|
||||
return
|
||||
}
|
||||
|
||||
// save original terminal settings in parent process
|
||||
watchdogOldState, errState := term.MakeRaw(int(os.Stdin.Fd()))
|
||||
if errState == nil {
|
||||
_ = term.Restore(int(os.Stdin.Fd()), watchdogOldState)
|
||||
cmdStdin := os.Stdin
|
||||
if !term.IsTerminal(int(cmdStdin.Fd())) {
|
||||
if tty, ttyErr := os.OpenFile("/dev/tty", os.O_RDWR, 0); ttyErr == nil {
|
||||
cmdStdin = tty
|
||||
}
|
||||
}
|
||||
|
||||
// save original terminal settings in parent process if Stdin is a terminal
|
||||
var watchdogOldState *term.State
|
||||
if term.IsTerminal(int(cmdStdin.Fd())) {
|
||||
var errState error
|
||||
watchdogOldState, errState = term.MakeRaw(int(cmdStdin.Fd()))
|
||||
if errState == nil {
|
||||
_ = term.Restore(int(cmdStdin.Fd()), watchdogOldState)
|
||||
}
|
||||
}
|
||||
|
||||
r, w, err := os.Pipe()
|
||||
@@ -94,7 +105,7 @@ func runWatchdog() {
|
||||
|
||||
cmd := exec.CommandContext(context.Background(), exe, os.Args[1:]...)
|
||||
cmd.Env = append(os.Environ(), "IRIS_IS_CHILD=true")
|
||||
cmd.Stdin = os.Stdin
|
||||
cmd.Stdin = cmdStdin
|
||||
cmd.Stdout = os.Stdout
|
||||
cmd.Stderr = w
|
||||
|
||||
@@ -160,7 +171,7 @@ func runWatchdog() {
|
||||
WriteCrashLog(string(content))
|
||||
// restore terminal state if watchdog saved it
|
||||
if watchdogOldState != nil {
|
||||
_ = term.Restore(int(os.Stdin.Fd()), watchdogOldState)
|
||||
_ = term.Restore(int(cmdStdin.Fd()), watchdogOldState)
|
||||
}
|
||||
printCrashNotice()
|
||||
startRescueShell()
|
||||
|
||||
Reference in New Issue
Block a user