From 36dbdd9a7182278d8bc106685c7960953dedf0ea Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Thu, 16 Jul 2020 02:42:54 -0400
Subject: simplify

---
 examples/basic.rs |  9 ++++--
 src/command.rs    | 91 ++++++++-----------------------------------------------
 2 files changed, 19 insertions(+), 81 deletions(-)

diff --git a/examples/basic.rs b/examples/basic.rs
index 6082b09..d3d795a 100644
--- a/examples/basic.rs
+++ b/examples/basic.rs
@@ -1,10 +1,13 @@
 use std::io::{Read as _, Write as _};
 use std::os::unix::io::AsRawFd as _;
 
+use pty_process::Command as _;
+
 fn main() {
-    let mut cmd = pty_process::Command::new("cat").unwrap();
-    // cmd.args(&["--color=auto"]);
-    let mut child = cmd.spawn().unwrap();
+    let mut child = std::process::Command::new("cat")
+        // .args(&["--color=auto"])
+        .spawn_pty()
+        .unwrap();
     let mut buf = [0_u8; 4096];
     let pty = child.pty().as_raw_fd();
     let stdin = std::io::stdin().as_raw_fd();
diff --git a/src/command.rs b/src/command.rs
index 421f2b8..e11df57 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -3,91 +3,24 @@ use crate::error::*;
 use std::os::unix::io::{AsRawFd as _, FromRawFd as _};
 use std::os::unix::process::CommandExt as _;
 
-pub struct Command {
-    command: std::process::Command,
+pub trait Command {
+    fn spawn_pty(&mut self) -> Result<Child>;
 }
 
-impl Command {
-    pub fn new<S: AsRef<std::ffi::OsStr>>(program: S) -> Result<Self> {
-        let command = std::process::Command::new(program);
-        Ok(Self { command })
-    }
-
-    pub fn arg<S: AsRef<std::ffi::OsStr>>(&mut self, arg: S) -> &mut Self {
-        self.command.arg(arg);
-        self
-    }
-
-    pub fn args<I, S>(&mut self, args: I) -> &mut Self
-    where
-        I: IntoIterator<Item = S>,
-        S: AsRef<std::ffi::OsStr>,
-    {
-        self.command.args(args);
-        self
-    }
-
-    pub fn env<K, V>(&mut self, key: K, val: V) -> &mut Self
-    where
-        K: AsRef<std::ffi::OsStr>,
-        V: AsRef<std::ffi::OsStr>,
-    {
-        self.command.env(key, val);
-        self
-    }
-
-    pub fn envs<I, K, V>(&mut self, vars: I) -> &mut Self
-    where
-        I: IntoIterator<Item = (K, V)>,
-        K: AsRef<std::ffi::OsStr>,
-        V: AsRef<std::ffi::OsStr>,
-    {
-        self.command.envs(vars);
-        self
-    }
-
-    pub fn env_remove<K: AsRef<std::ffi::OsStr>>(
-        &mut self,
-        key: K,
-    ) -> &mut Self {
-        self.command.env_remove(key);
-        self
-    }
-
-    pub fn env_clear(&mut self) -> &mut Self {
-        self.command.env_clear();
-        self
-    }
-
-    pub fn current_dir<P: AsRef<std::path::Path>>(
-        &mut self,
-        dir: P,
-    ) -> &mut Self {
-        self.command.current_dir(dir);
-        self
-    }
-
-    pub fn uid(&mut self, id: u32) -> &mut Self {
-        self.command.uid(id);
-        self
-    }
-
-    pub fn gid(&mut self, id: u32) -> &mut Self {
-        self.command.gid(id);
-        self
-    }
-
-    pub fn spawn(&mut self) -> Result<Child> {
+impl Command for std::process::Command {
+    fn spawn_pty(&mut self) -> Result<Child> {
         let pty = crate::pty::Pty::new()?;
-        let pt_fd = pty.pt().as_raw_fd();
         let pts = pty.pts()?;
+
+        let pt_fd = pty.pt().as_raw_fd();
         let pts_fd = pts.as_raw_fd();
-        self.command
-            .stdin(unsafe { std::process::Stdio::from_raw_fd(pts_fd) })
+
+        self.stdin(unsafe { std::process::Stdio::from_raw_fd(pts_fd) })
             .stdout(unsafe { std::process::Stdio::from_raw_fd(pts_fd) })
             .stderr(unsafe { std::process::Stdio::from_raw_fd(pts_fd) });
+
         unsafe {
-            self.command.pre_exec(move || {
+            self.pre_exec(move || {
                 // XXX unwrap
                 nix::unistd::close(pt_fd)
                     .map_err(|e| e.as_errno().unwrap())?;
@@ -96,7 +29,9 @@ impl Command {
                 Ok(())
             });
         }
-        let child = self.command.spawn()?;
+
+        let child = self.spawn()?;
+
         Ok(Child { child, pty })
     }
 }
-- 
cgit v1.2.3