blasthavers/minicrossterm
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Automatically close raw fd (#383)

Browse Source
This commit is contained in:
Jonathan Turner 2020-02-22 19:59:40 +13:00 committed by GitHub
parent e35d4d2c1c
commit 007063896e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/event.rs
View File

@ -91,7 +91,7 @@ mod read;
mod source; mod source;
#[cfg(feature = "event-stream")] #[cfg(feature = "event-stream")]
mod stream; mod stream;
mod sys; pub(crate) mod sys;
mod timeout; mod timeout;
lazy_static! { lazy_static! {

10
src/terminal/sys/unix.rs
View File

@ -1,13 +1,13 @@
//! UNIX related logic for terminal manipulation. //! UNIX related logic for terminal manipulation.
use std::{io, mem, process, sync::Mutex}; use std::{io, mem, process, sync::Mutex};
use crate::event::sys::unix::file_descriptor::FileDesc;
use lazy_static::lazy_static;
use libc::{ use libc::{
cfmakeraw, ioctl, tcgetattr, tcsetattr, termios as Termios, winsize, STDIN_FILENO, TCSANOW, cfmakeraw, ioctl, tcgetattr, tcsetattr, termios as Termios, winsize, STDIN_FILENO, TCSANOW,
TIOCGWINSZ, TIOCGWINSZ,
}; };
use lazy_static::lazy_static;
use crate::error::{ErrorKind, Result}; use crate::error::{ErrorKind, Result};
use std::fs::File; use std::fs::File;
use std::os::unix::io::IntoRawFd; use std::os::unix::io::IntoRawFd;
@ -32,10 +32,10 @@ pub(crate) fn size() -> Result<(u16, u16)> {
ws_ypixel: 0, ws_ypixel: 0,
}; };
let file = File::open("/dev/tty").unwrap(); let file = File::open("/dev/tty")?;
if let Ok(true) = let fd = FileDesc::new(file.into_raw_fd(), true);
wrap_with_result(unsafe { ioctl(file.into_raw_fd(), TIOCGWINSZ.into(), &mut size) }) if let Ok(true) = wrap_with_result(unsafe { ioctl(fd.raw_fd(), TIOCGWINSZ.into(), &mut size) })
{ {
Ok((size.ws_col, size.ws_row)) Ok((size.ws_col, size.ws_row))
} else { } else {