Refactor: Invoke set_blocking in Command::spawn

Signed-off-by: Jiahao XU <[email protected]>

Author: NobodyXu

src/native_mux_impl/command.rs

@@ -1,6 +1,6 @@
 use super::Error;
 use super::RemoteChild;
-use super::{ChildStderr, ChildStdin, ChildStdout, Stdio};
+use super::{stdio::set_blocking, ChildStderr, ChildStdin, ChildStdout, Stdio};
 
 use std::borrow::Cow;
 use std::ffi::OsStr;
@@ -71,6 +71,10 @@ impl Command {
             stderr.as_raw_fd_or_null_fd()?,
         ];
 
+        for stdio in stdios {
+            set_blocking(stdio).map_err(Error::ChildIo)?;
+        }
+
         let cmd = NonZeroByteSlice::new(&self.cmd).ok_or(Error::InvalidCommand)?;
 
         let session = Session::builder()

src/native_mux_impl/stdio.rs

@@ -42,7 +42,7 @@ fn cvt(ret: c_int) -> io::Result<c_int> {
     }
 }
 
-fn set_blocking(fd: RawFd) -> io::Result<()> {
+pub(super) fn set_blocking(fd: RawFd) -> io::Result<()> {
     let flags = cvt(unsafe { fcntl(fd, F_GETFL) })?;
     cvt(unsafe { fcntl(fd, F_SETFL, flags & (!O_NONBLOCK)) })?;
 
@@ -53,18 +53,10 @@ impl Fd {
     pub(crate) fn as_raw_fd_or_null_fd(&self) -> Result<RawFd, Error> {
         use Fd::*;
 
-        let fd = match self {
-            Owned(owned_fd) => Some(owned_fd.as_raw_fd()),
-            Borrowed(rawfd) => Some(*rawfd),
-            Null => None,
-        };
-
-        if let Some(fd) = fd {
-            set_blocking(fd).map_err(Error::ChildIo)?;
-
-            Ok(fd)
-        } else {
-            get_null_fd()
+        match self {
+            Owned(owned_fd) => Ok(owned_fd.as_raw_fd()),
+            Borrowed(rawfd) => Ok(*rawfd),
+            Null => get_null_fd(),
         }
     }