Skip to content

Commit 8600fef

Browse files
Fix libc module name for FreeBSD
1 parent 73cfcc6 commit 8600fef

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

src/libstd/sys/unix/os.rs

+9-11
Original file line numberDiff line numberDiff line change
@@ -167,22 +167,20 @@ impl StdError for JoinPathsError {
167167
#[cfg(target_os = "freebsd")]
168168
pub fn current_exe() -> io::Result<PathBuf> {
169169
unsafe {
170-
use libc::funcs::bsd44::*;
171-
use libc::consts::os::extra::*;
172-
let mut mib = [CTL_KERN as c_int,
173-
KERN_PROC as c_int,
174-
KERN_PROC_PATHNAME as c_int,
170+
let mut mib = [libc::CTL_KERN as c_int,
171+
libc::KERN_PROC as c_int,
172+
libc::KERN_PROC_PATHNAME as c_int,
175173
-1 as c_int];
176174
let mut sz: libc::size_t = 0;
177-
let err = sysctl(mib.as_mut_ptr(), mib.len() as ::libc::c_uint,
178-
ptr::null_mut(), &mut sz, ptr::null_mut(),
179-
0 as libc::size_t);
175+
let err = libc::sysctl(mib.as_mut_ptr(), mib.len() as ::libc::c_uint,
176+
ptr::null_mut(), &mut sz, ptr::null_mut(),
177+
0 as libc::size_t);
180178
if err != 0 { return Err(io::Error::last_os_error()); }
181179
if sz == 0 { return Err(io::Error::last_os_error()); }
182180
let mut v: Vec<u8> = Vec::with_capacity(sz as usize);
183-
let err = sysctl(mib.as_mut_ptr(), mib.len() as ::libc::c_uint,
184-
v.as_mut_ptr() as *mut libc::c_void, &mut sz,
185-
ptr::null_mut(), 0 as libc::size_t);
181+
let err = libc::sysctl(mib.as_mut_ptr(), mib.len() as ::libc::c_uint,
182+
v.as_mut_ptr() as *mut libc::c_void, &mut sz,
183+
ptr::null_mut(), 0 as libc::size_t);
186184
if err != 0 { return Err(io::Error::last_os_error()); }
187185
if sz == 0 { return Err(io::Error::last_os_error()); }
188186
v.set_len(sz as usize - 1); // chop off trailing NUL

0 commit comments

Comments
 (0)