diff options
| author | Jeremy Soller <jackpot51@gmail.com> | 2017-04-16 09:33:13 -0600 |
|---|---|---|
| committer | Jeremy Soller <jackpot51@gmail.com> | 2017-04-16 09:33:32 -0600 |
| commit | 1bc9e5da2367cdeebd86afb4ad1a3d45aae53837 (patch) | |
| tree | a907500f8bb7ea613a244931891a74895a35581f /src/libstd/sys/redox/process.rs | |
| parent | 28a74299778cdad4ea999e4ee8f8c1ef793338bd (diff) | |
| download | rust-1bc9e5da2367cdeebd86afb4ad1a3d45aae53837.tar.gz rust-1bc9e5da2367cdeebd86afb4ad1a3d45aae53837.zip | |
Fix stdio descriptors in exec by removing cloexec if present. Use dup2 instead of dup
Diffstat (limited to 'src/libstd/sys/redox/process.rs')
| -rw-r--r-- | src/libstd/sys/redox/process.rs | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/libstd/sys/redox/process.rs b/src/libstd/sys/redox/process.rs index 707b4cbc6ac..95e9438cd71 100644 --- a/src/libstd/sys/redox/process.rs +++ b/src/libstd/sys/redox/process.rs @@ -270,19 +270,22 @@ impl Command { } if let Some(fd) = stdio.stderr.fd() { - let _ = syscall::close(2); - t!(cvt(syscall::dup(fd, &[]))); - let _ = syscall::close(fd); + t!(cvt(syscall::dup2(fd, 2, &[]))); + let mut flags = t!(cvt(syscall::fcntl(2, syscall::F_GETFL, 0))); + flags &= ! syscall::O_CLOEXEC; + t!(cvt(syscall::fcntl(2, syscall::F_SETFL, flags))); } if let Some(fd) = stdio.stdout.fd() { - let _ = syscall::close(1); - t!(cvt(syscall::dup(fd, &[]))); - let _ = syscall::close(fd); + t!(cvt(syscall::dup2(fd, 1, &[]))); + let mut flags = t!(cvt(syscall::fcntl(1, syscall::F_GETFL, 0))); + flags &= ! syscall::O_CLOEXEC; + t!(cvt(syscall::fcntl(1, syscall::F_SETFL, flags))); } if let Some(fd) = stdio.stdin.fd() { - let _ = syscall::close(0); - t!(cvt(syscall::dup(fd, &[]))); - let _ = syscall::close(fd); + t!(cvt(syscall::dup2(fd, 0, &[]))); + let mut flags = t!(cvt(syscall::fcntl(0, syscall::F_GETFL, 0))); + flags &= ! syscall::O_CLOEXEC; + t!(cvt(syscall::fcntl(0, syscall::F_SETFL, flags))); } if let Some(g) = self.gid { |