mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use env::current_exe for libbacktrace on macOS

Browse Source
This commit is contained in:
John Colanduoni 2017-08-09 22:09:59 -07:00 committed by kennytm
parent e3de40e72f
commit 09f572b7dc
No known key found for this signature in database
GPG Key ID: FEF6C8051D0E013C
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/libstd/sys/unix/backtrace/mod.rs
View File

@ -104,28 +104,15 @@ pub fn get_executable_filename() -> io::Result<(Vec<c_char>, fs::File)> {
#[cfg(any(target_os = "macos", target_os = "ios"))]
pub fn get_executable_filename() -> io::Result<(Vec<c_char>, fs::File)> {
use ptr;
use slice;
use ffi::OsStr;
use env;
use os::unix::ffi::OsStrExt;
use libc::c_int;
extern {
fn _NSGetExecutablePath(buf: *mut c_char,
bufsize: *mut u32) -> c_int;
}
unsafe {
let mut bufsize: u32 = 0;
_NSGetExecutablePath(ptr::null_mut(), &mut bufsize);
if bufsize == 0 { return Err(io::Error::last_os_error()); }
let mut buffer: Vec<c_char> = Vec::with_capacity(bufsize as usize);
let ret = _NSGetExecutablePath(buffer.as_mut_ptr(), &mut bufsize);
if ret != 0 { return Err(io::Error::last_os_error()); }
buffer.set_len(bufsize as usize);
let file = fs::File::open(OsStr::from_bytes(
slice::from_raw_parts(buffer.as_ptr() as *const u8, buffer.len()-1)))?;
Ok((buffer, file))
}
let filename = env::current_exe()?;
let file = fs::File::open(&filename)?;
let mut filename_cstr: Vec<_> = filename.as_os_str().as_bytes().iter()
.map(|&x| x as c_char).collect();
filename_cstr.push(0); // Null terminate
Ok((filename_cstr, file))
}
}