diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/liblibc/lib.rs | 21 | ||||
| -rw-r--r-- | src/libstd/sys/unix/fs.rs | 5 |
2 files changed, 25 insertions, 1 deletions
diff --git a/src/liblibc/lib.rs b/src/liblibc/lib.rs index 0459d5ce953..5cd806dc9e3 100644 --- a/src/liblibc/lib.rs +++ b/src/liblibc/lib.rs @@ -102,6 +102,7 @@ pub use types::os::arch::extra::*; pub use consts::os::c95::*; pub use consts::os::posix88::*; pub use consts::os::posix01::*; +pub use consts::os::posix08::*; pub use consts::os::bsd44::*; pub use consts::os::extra::*; @@ -3611,6 +3612,8 @@ pub mod consts { pub const RUSAGE_THREAD: c_int = 1; } pub mod posix08 { + use types::os::arch::c95::c_int; + pub const O_CLOEXEC: c_int = 0x80000; } #[cfg(any(target_arch = "arm", target_arch = "aarch64", @@ -4270,7 +4273,15 @@ pub mod consts { pub const RUSAGE_CHILDREN: c_int = -1; pub const RUSAGE_THREAD: c_int = 1; } + #[cfg(target_os = "freebsd")] pub mod posix08 { + use types::os::arch::c95::c_int; + pub const O_CLOEXEC: c_int = 0x100000; + } + #[cfg(target_os = "dragonfly")] + pub mod posix08 { + use types::os::arch::c95::c_int; + pub const O_CLOEXEC: c_int = 0x20000; } pub mod bsd44 { use types::os::arch::c95::c_int; @@ -4713,7 +4724,15 @@ pub mod consts { pub const RUSAGE_CHILDREN: c_int = -1; pub const RUSAGE_THREAD: c_int = 1; } + #[cfg(any(target_os = "bitrig", target_os = "openbsd"))] pub mod posix08 { + use types::os::arch::c95::c_int; + pub const O_CLOEXEC: c_int = 0x10000; + } + #[cfg(target_os = "netbsd")] + pub mod posix08 { + use types::os::arch::c95::c_int; + pub const O_CLOEXEC: c_int = 0x400000; } pub mod bsd44 { use types::os::arch::c95::c_int; @@ -5151,6 +5170,8 @@ pub mod consts { pub const RUSAGE_THREAD: c_int = 1; } pub mod posix08 { + use types::os::arch::c95::c_int; + pub const O_CLOEXEC: c_int = 0x1000000; } pub mod bsd44 { use types::os::arch::c95::c_int; diff --git a/src/libstd/sys/unix/fs.rs b/src/libstd/sys/unix/fs.rs index 751b8e48263..cbbdd223dc2 100644 --- a/src/libstd/sys/unix/fs.rs +++ b/src/libstd/sys/unix/fs.rs @@ -212,7 +212,7 @@ impl DirEntry { impl OpenOptions { pub fn new() -> OpenOptions { OpenOptions { - flags: 0, + flags: libc::O_CLOEXEC, read: false, write: false, mode: 0o666, @@ -269,6 +269,9 @@ impl File { libc::open(path.as_ptr(), flags, opts.mode) })); let fd = FileDesc::new(fd); + // Even though we open with the O_CLOEXEC flag, still set CLOEXEC here, + // in case the open flag is not supported (it's just ignored by the OS + // in that case). fd.set_cloexec(); Ok(File(fd)) } |