Skip to content

Unix tweaks #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
djc merged 2 commits into from
Dec 17, 2024
Merged

Unix tweaks #230

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b9bb4b
Make Input constructors associated methods
djc Dec 17, 2024
6bab9ee
Remove unnecessary type annotation
djc Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 22 additions & 18 deletions src/unix_term.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,24 +70,28 @@ enum Input<T> {
File(T),
}

fn unbuffered_input() -> io::Result<Input<fs::File>> {
let stdin = io::stdin();
if is_a_terminal(&stdin) {
Ok(Input::Stdin(stdin))
} else {
let f = fs::OpenOptions::new()
.read(true)
.write(true)
.open("/dev/tty")?;
Ok(Input::File(f))
impl Input<BufReader<fs::File>> {
fn buffered() -> io::Result<Self> {
Ok(match Input::unbuffered()? {
Input::Stdin(s) => Input::Stdin(s),
Input::File(f) => Input::File(BufReader::new(f)),
})
}
}

fn buffered_input() -> io::Result<Input<BufReader<fs::File>>> {
Ok(match unbuffered_input()? {
Input::Stdin(s) => Input::Stdin(s),
Input::File(f) => Input::File(BufReader::new(f)),
})
impl Input<fs::File> {
fn unbuffered() -> io::Result<Self> {
let stdin = io::stdin();
if is_a_terminal(&stdin) {
Ok(Input::Stdin(stdin))
} else {
let f = fs::OpenOptions::new()
.read(true)
.write(true)
.open("/dev/tty")?;
Ok(Input::File(f))
}
}
}

// NB: this is not a full BufRead implementation because io::Stdin does not implement BufRead.
Expand Down Expand Up @@ -119,7 +123,7 @@ impl AsRawFd for Input<BufReader<fs::File>> {
}

pub(crate) fn read_secure() -> io::Result<String> {
let mut input = buffered_input()?;
let mut input = Input::buffered()?;

let mut termios = mem::MaybeUninit::uninit();
c_result(|| unsafe { libc::tcgetattr(input.as_raw_fd(), termios.as_mut_ptr()) })?;
Expand Down Expand Up @@ -332,7 +336,7 @@ fn read_single_key_impl(fd: RawFd) -> Result<Key, io::Error> {
}

pub(crate) fn read_single_key(ctrlc_key: bool) -> io::Result<Key> {
let input = unbuffered_input()?;
let input = Input::unbuffered()?;

let mut termios = core::mem::MaybeUninit::uninit();
c_result(|| unsafe { libc::tcgetattr(input.as_raw_fd(), termios.as_mut_ptr()) })?;
Expand All @@ -341,7 +345,7 @@ pub(crate) fn read_single_key(ctrlc_key: bool) -> io::Result<Key> {
unsafe { libc::cfmakeraw(&mut termios) };
termios.c_oflag = original.c_oflag;
c_result(|| unsafe { libc::tcsetattr(input.as_raw_fd(), libc::TCSADRAIN, &termios) })?;
let rv: io::Result<Key> = read_single_key_impl(input.as_raw_fd());
let rv = read_single_key_impl(input.as_raw_fd());
c_result(|| unsafe { libc::tcsetattr(input.as_raw_fd(), libc::TCSADRAIN, &original) })?;

// if the user hit ^C we want to signal SIGINT to ourselves.
Expand Down