Use OwnedFd with NullTty

src/pty.rs

@@ -3,7 +3,6 @@ use crate::tty::Tty;
 use anyhow::{bail, Result};
 use nix::errno::Errno;
 use nix::sys::select::{select, FdSet};
-use nix::unistd::pipe;
 use nix::{libc, pty, sys::signal, sys::wait, unistd, unistd::ForkResult};
 use signal_hook::consts::{SIGHUP, SIGINT, SIGQUIT, SIGTERM, SIGWINCH};
 use signal_hook::SigId;
@@ -316,7 +315,7 @@ struct SignalFd {
 
 impl SignalFd {
     fn open(signal: libc::c_int) -> Result<Self> {
-        let (rx, tx) = pipe()?;
+        let (rx, tx) = unistd::pipe()?;
         set_non_blocking(&rx)?;
         set_non_blocking(&tx)?;
         let rx = unsafe { OwnedFd::from_raw_fd(rx) };

src/tty.rs

@@ -2,7 +2,7 @@ use anyhow::Result;
 use nix::{libc, pty, unistd};
 use std::{
     fs, io,
-    os::fd::{AsFd, AsRawFd, BorrowedFd},
+    os::fd::{AsFd, AsRawFd, BorrowedFd, FromRawFd, OwnedFd},
 };
 use termion::raw::{IntoRawMode, RawTerminal};
 
@@ -66,13 +66,15 @@ impl AsFd for DevTty {
 }
 
 pub struct NullTty {
-    tx: i32,
-    _rx: i32,
+    tx: OwnedFd,
+    _rx: OwnedFd,
 }
 
 impl NullTty {
     pub fn open() -> Result<Self> {
         let (rx, tx) = unistd::pipe()?;
+        let rx = unsafe { OwnedFd::from_raw_fd(rx) };
+        let tx = unsafe { OwnedFd::from_raw_fd(tx) };
 
         Ok(Self { tx, _rx: rx })
     }
@@ -107,6 +109,6 @@ impl io::Write for NullTty {
 
 impl AsFd for NullTty {
     fn as_fd(&self) -> BorrowedFd<'_> {
-        unsafe { BorrowedFd::borrow_raw(self.tx.as_raw_fd()) }
+        self.tx.as_fd()
     }
 }