mirror of
https://github.com/fish-shell/fish-shell.git
synced 2025-01-22 12:58:47 +08:00
reader: Use our isatty overload
Removes an annoying use of unsafe
This commit is contained in:
parent
ffc4372cad
commit
a64a50db47
|
@ -73,6 +73,7 @@ use crate::input_common::{CharEvent, CharInputStyle, ReadlineCmd};
|
||||||
use crate::io::IoChain;
|
use crate::io::IoChain;
|
||||||
use crate::kill::{kill_add, kill_replace, kill_yank, kill_yank_rotate};
|
use crate::kill::{kill_add, kill_replace, kill_yank, kill_yank_rotate};
|
||||||
use crate::libc::MB_CUR_MAX;
|
use crate::libc::MB_CUR_MAX;
|
||||||
|
use crate::nix::isatty;
|
||||||
use crate::operation_context::{get_bg_context, OperationContext};
|
use crate::operation_context::{get_bg_context, OperationContext};
|
||||||
use crate::output::Outputter;
|
use crate::output::Outputter;
|
||||||
use crate::pager::{PageRendering, Pager, SelectionMotion};
|
use crate::pager::{PageRendering, Pager, SelectionMotion};
|
||||||
|
@ -548,8 +549,7 @@ pub fn reader_read(parser: &Parser, fd: RawFd, io: &IoChain) -> c_int {
|
||||||
// int inter = ((fd == STDIN_FILENO) && isatty(STDIN_FILENO));
|
// int inter = ((fd == STDIN_FILENO) && isatty(STDIN_FILENO));
|
||||||
if fd == STDIN_FILENO {
|
if fd == STDIN_FILENO {
|
||||||
let mut t: libc::termios = unsafe { std::mem::zeroed() };
|
let mut t: libc::termios = unsafe { std::mem::zeroed() };
|
||||||
let a_tty = unsafe { libc::isatty(STDIN_FILENO) } != 0;
|
if isatty(STDIN_FILENO) {
|
||||||
if a_tty {
|
|
||||||
interactive = true;
|
interactive = true;
|
||||||
} else if unsafe { libc::tcgetattr(STDIN_FILENO, &mut t) } == -1 && errno().0 == EIO {
|
} else if unsafe { libc::tcgetattr(STDIN_FILENO, &mut t) } == -1 && errno().0 == EIO {
|
||||||
redirect_tty_output();
|
redirect_tty_output();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user