From e2be3c34b48fdaa34ae4544826633f3e0595fbde Mon Sep 17 00:00:00 2001 From: Niklas Claesson Date: Sun, 28 May 2017 04:52:58 +0200 Subject: Remove incorrect close (#552) Ownership of the slave file descriptor is passed to the process::Stdio structs and will be closed when they are dropped. If the slave fd is closed explicitly then the next fd that is opened during the same scope will get silently closed by the Stdio structs when they are dropped. --- src/tty.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/tty.rs b/src/tty.rs index 9f8a4764..bd291b16 100644 --- a/src/tty.rs +++ b/src/tty.rs @@ -193,6 +193,9 @@ pub fn new(config: &Config, options: &Options, size: T) -> Pty { } // Setup child stdin/stdout/stderr as slave fd of pty + // Ownership of fd is transferred to the Stdio structs and will be closed by them at the end of + // this scope. (It is not an issue that the fd is closed three times since File::drop ignores + // error on libc::close.) builder.stdin(unsafe { Stdio::from_raw_fd(slave) }); builder.stderr(unsafe { Stdio::from_raw_fd(slave) }); builder.stdout(unsafe { Stdio::from_raw_fd(slave) }); @@ -248,9 +251,6 @@ pub fn new(config: &Config, options: &Options, size: T) -> Pty { // Handle SIGCHLD libc::signal(SIGCHLD, sigchld as _); - - // Parent doesn't need slave fd - libc::close(slave); } unsafe { // Maybe this should be done outside of this function so nonblocking -- cgit v1.2.3