mirror of
https://github.com/fish-shell/fish-shell.git
synced 2026-06-20 05:41:14 -03:00
5278259312
The previous control flow logic wasn't sound and would leave the shell in a hung state when `break` would be encountered. The behavior is now straightforward, the shell reads until <Enter> or <q> is pressed, at which point it aborts.
37 lines
1.1 KiB
Rust
37 lines
1.1 KiB
Rust
use std::panic::{set_hook, take_hook, UnwindSafe};
|
|
|
|
use libc::STDIN_FILENO;
|
|
|
|
use crate::{
|
|
common::{read_blocked, PROGRAM_NAME},
|
|
nix::isatty,
|
|
threads::asan_maybe_exit,
|
|
};
|
|
|
|
pub fn panic_handler(main: impl FnOnce() -> i32 + UnwindSafe) -> ! {
|
|
if isatty(STDIN_FILENO) {
|
|
let standard_hook = take_hook();
|
|
set_hook(Box::new(move |panic_info| {
|
|
standard_hook(panic_info);
|
|
eprintf!(
|
|
"%s crashed, please report a bug. Debug PID %d or press Enter to exit",
|
|
PROGRAM_NAME.get().unwrap(),
|
|
unsafe { libc::getpid() }
|
|
);
|
|
// Move the cursor down so it isn't blocking the text
|
|
eprintf!("\n");
|
|
let mut buf = [0_u8; 1];
|
|
loop {
|
|
let n = read_blocked(STDIN_FILENO, &mut buf).unwrap_or(0);
|
|
if n == 0 || matches!(buf[0], b'q' | b'\n' | b'\r') {
|
|
eprintf!("\n");
|
|
std::process::abort();
|
|
}
|
|
}
|
|
}));
|
|
}
|
|
let exit_status = main();
|
|
asan_maybe_exit(exit_status);
|
|
std::process::exit(exit_status)
|
|
}
|