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

Rollup merge of #42056 - sylvestre:master, r=alexcrichton

Browse Source 
Improve the error management when /proc is not mounted

This PR does two things:
* Triggers an error on GNU/Linux & Android when /proc/self/exe doesn't exist
* Handle the error properly
This commit is contained in:
Mark Simulacrum 2017-05-19 14:16:18 -06:00 committed by GitHub
commit 0011828334
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/librustc/session/filesearch.rs
View File

@ -159,11 +159,16 @@ pub fn get_or_default_sysroot() -> PathBuf {
}) })
} }
match canonicalize(env::current_exe().ok()) { match env::current_exe() {
Some(mut p) => { p.pop(); p.pop(); p } Ok(exe) => {
match canonicalize(Some(exe)) {
Some(mut p) => { p.pop(); p.pop(); return p; },
None => bug!("can't determine value for sysroot") None => bug!("can't determine value for sysroot")
} }
} }
Err(ref e) => panic!(format!("failed to get current_exe: {}", e))
}
}
// The name of the directory rustc expects libraries to be located. // The name of the directory rustc expects libraries to be located.
fn find_libdir(sysroot: &Path) -> Cow<'static, str> { fn find_libdir(sysroot: &Path) -> Cow<'static, str> {

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

@ -253,7 +253,12 @@ pub fn current_exe() -> io::Result<PathBuf> {
#[cfg(any(target_os = "linux", target_os = "android", target_os = "emscripten"))] #[cfg(any(target_os = "linux", target_os = "android", target_os = "emscripten"))]
pub fn current_exe() -> io::Result<PathBuf> { pub fn current_exe() -> io::Result<PathBuf> {
::fs::read_link("/proc/self/exe") let selfexe = PathBuf::from("/proc/self/exe");
if selfexe.exists() {
::fs::read_link(selfexe)
} else {
Err(io::Error::new(io::ErrorKind::Other, "no /proc/self/exe available. Is /proc mounted?"))
}
} }
#[cfg(any(target_os = "macos", target_os = "ios"))] #[cfg(any(target_os = "macos", target_os = "ios"))]