This PR does two things:
* Triggers an error on GNU/Linux & Android when /proc/self/exe doesn't exist
* Handle the error properly
})
}
- match canonicalize(env::current_exe().ok()) {
- Some(mut p) => { p.pop(); p.pop(); p }
- None => bug!("can't determine value for sysroot")
+ match env::current_exe() {
+ Ok(exe) => {
+ match canonicalize(Some(exe)) {
+ Some(mut p) => { p.pop(); p.pop(); return p; },
+ None => bug!("can't determine value for sysroot")
+ }
+ }
+ Err(ref e) => panic!(format!("failed to get current_exe: {}", e))
}
}
#[cfg(any(target_os = "linux", target_os = "android", target_os = "emscripten"))]
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"))]