From 39287b07f87aba15c4cb0f64d7008ba67289151d Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Tue, 22 Feb 2022 17:02:12 -0500
Subject: another rewrite

---
 src/blocking/pty.rs | 65 +++++++++++++++++++++++++++--------------------------
 1 file changed, 33 insertions(+), 32 deletions(-)

(limited to 'src/blocking/pty.rs')

diff --git a/src/blocking/pty.rs b/src/blocking/pty.rs
index 6fa3382..e2c5bde 100644
--- a/src/blocking/pty.rs
+++ b/src/blocking/pty.rs
@@ -1,8 +1,5 @@
 /// An allocated pty
-pub struct Pty {
-    pt: std::fs::File,
-    pts: std::fs::File,
-}
+pub struct Pty(crate::sys::Pty);
 
 impl Pty {
     /// Allocate and return a new pty.
@@ -10,12 +7,7 @@ impl Pty {
     /// # Errors
     /// Returns an error if the pty failed to be allocated.
     pub fn new() -> crate::Result<Self> {
-        let (pt, ptsname) = crate::sys::create_pt()?;
-        let pts = std::fs::OpenOptions::new()
-            .read(true)
-            .write(true)
-            .open(&ptsname)?;
-        Ok(Self { pt, pts })
+        Ok(Self(crate::sys::Pty::open()?))
     }
 
     /// Change the terminal size associated with the pty.
@@ -23,51 +15,60 @@ impl Pty {
     /// # Errors
     /// Returns an error if we were unable to set the terminal size.
     pub fn resize(&self, size: crate::Size) -> crate::Result<()> {
-        Ok(crate::sys::set_term_size(self, size)?)
+        self.0.set_term_size(size)
     }
 
-    pub(crate) fn pts(&self) -> &std::fs::File {
-        &self.pts
+    /// Opens a file descriptor for the other end of the pty, which should be
+    /// attached to the child process running in it. See
+    /// [`Command::spawn`](crate::blocking::Command::spawn).
+    ///
+    /// # Errors
+    /// Returns an error if the device node to open could not be determined,
+    /// or if the device node could not be opened.
+    pub fn pts(&self) -> crate::Result<Pts> {
+        Ok(Pts(self.0.pts()?))
     }
 }
 
-impl std::ops::Deref for Pty {
-    type Target = std::fs::File;
-
-    fn deref(&self) -> &Self::Target {
-        &self.pt
+impl std::os::unix::io::AsRawFd for Pty {
+    fn as_raw_fd(&self) -> std::os::unix::io::RawFd {
+        self.0 .0.as_raw_fd()
     }
 }
 
-impl std::ops::DerefMut for Pty {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.pt
+impl std::io::Read for Pty {
+    fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
+        self.0 .0.read(buf)
     }
 }
 
-impl std::os::unix::io::AsRawFd for Pty {
-    fn as_raw_fd(&self) -> std::os::unix::io::RawFd {
-        self.pt.as_raw_fd()
+impl std::io::Write for Pty {
+    fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
+        self.0 .0.write(buf)
+    }
+
+    fn flush(&mut self) -> std::io::Result<()> {
+        self.0 .0.flush()
     }
 }
 
-// there is a Read impl for &std::fs::File, but without this explicit impl,
-// rust finds the Read impl for std::fs::File first, and then complains that
-// it requires &mut self, because method resolution/autoderef doesn't take
-// mutability into account
 impl std::io::Read for &Pty {
     fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
-        (&self.pt).read(buf)
+        (&self.0 .0).read(buf)
     }
 }
 
-// same as above
 impl std::io::Write for &Pty {
     fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
-        (&self.pt).write(buf)
+        (&self.0 .0).write(buf)
     }
 
     fn flush(&mut self) -> std::io::Result<()> {
-        (&self.pt).flush()
+        (&self.0 .0).flush()
     }
 }
+
+/// The child end of the pty
+///
+/// See [`Pty::pts`] and [`Command::spawn`](crate::blocking::Command::spawn)
+pub struct Pts(pub(crate) crate::sys::Pts);
-- 
cgit v1.2.3-54-g00ecf