OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #38197 - mneumann:dragonfly-fixes-2016-12-06, r=alexcrichton 

Fix current_exe() on DragonFly (again)

This is a follow up on [this pull request][1].

Since DragonFly 4.6.1 ([this commit][2]), the ```kern.proc.pathname```
sysctl works correctly, i.e. it does not return paths including a ```:```
(see [here][3]). Use it and don't try to fix old versions of DragonFly!
There are not many DragonFly installations out there that we can't
control and no one is compiling Rust from source. If someone wants to
run Rust on a pre-4.6.1 DragonFly system, the ports system should
provide a patch.

[1]: https://github.com/rust-lang/rust/pull/35494
[2]: https://gitweb.dragonflybsd.org/dragonfly.git/commit/726f7ca07e193db73635e9c4e24e40c96087d6d9
[3]: https://gist.github.com/mneumann/a2f6b6a0a03935b561d6185872a4b222
This commit is contained in:
bors 2016-12-09 15:45:41 +00:00
parent bd148d220e dfd3b908f5
commit 51d29343c0
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libstd/sys/unix/os.rs
View File

@ -78,7 +78,7 @@ pub fn errno() -> i32 {
static errno: c_int; static errno: c_int;
} }
errno as i32 unsafe { errno as i32 }
} }
/// Gets a detailed string description for the given error number. /// Gets a detailed string description for the given error number.
@ -193,7 +193,7 @@ impl StdError for JoinPathsError {
fn description(&self) -> &str { "failed to join paths" } fn description(&self) -> &str { "failed to join paths" }
} }
#[cfg(target_os = "freebsd")] #[cfg(any(target_os = "freebsd", target_os = "dragonfly"))]
pub fn current_exe() -> io::Result<PathBuf> { pub fn current_exe() -> io::Result<PathBuf> {
unsafe { unsafe {
let mut mib = [libc::CTL_KERN as c_int, let mut mib = [libc::CTL_KERN as c_int,
@ -218,11 +218,6 @@ pub fn current_exe() -> io::Result<PathBuf> {
} }
} }
#[cfg(target_os = "dragonfly")]
pub fn current_exe() -> io::Result<PathBuf> {
::fs::read_link("/proc/curproc/file")
}
#[cfg(target_os = "netbsd")] #[cfg(target_os = "netbsd")]
pub fn current_exe() -> io::Result<PathBuf> { pub fn current_exe() -> io::Result<PathBuf> {
::fs::read_link("/proc/curproc/exe") ::fs::read_link("/proc/curproc/exe")