squiid/rust-libc
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Auto merge of #944 - wictory:invalid_functions_in_openbsd, r=alexcrichton

Browse source 
getpwent_r() and getgrent_r() doesn't exist in OpenBSD and Bitrig
This commit is contained in:
bors 2018-03-07 16:27:40 +00:00
parent 659de79564 6b20b3761c
commit 30c205c7b1
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/unix/bsd/netbsdlike/mod.rs
View file

@ -637,15 +637,6 @@ extern {
groups: *mut ::gid_t,
ngroups: *mut ::c_int) -> ::c_int;
pub fn initgroups(name: *const ::c_char, basegid: ::gid_t) -> ::c_int;
#[cfg_attr(target_os = "netbsd", link_name = "__getpwent_r50")]
pub fn getpwent_r(pwd: *mut ::passwd,
buf: *mut ::c_char,
buflen: ::size_t,
result: *mut *mut ::passwd) -> ::c_int;
pub fn getgrent_r(grp: *mut ::group,
buf: *mut ::c_char,
buflen: ::size_t,
result: *mut *mut ::group) -> ::c_int;
pub fn fexecve(fd: ::c_int, argv: *const *const ::c_char,
envp: *const *const ::c_char)
-> ::c_int;

13
src/unix/bsd/netbsdlike/netbsd/mod.rs
View file

@ -1074,5 +1074,18 @@ extern {
pub fn settimeofday(tv: *const ::timeval, tz: *const ::c_void) -> ::c_int;
}
#[link(name = "util")]
extern {
#[cfg_attr(target_os = "netbsd", link_name = "__getpwent_r50")]
pub fn getpwent_r(pwd: *mut ::passwd,
buf: *mut ::c_char,
buflen: ::size_t,
result: *mut *mut ::passwd) -> ::c_int;
pub fn getgrent_r(grp: *mut ::group,
buf: *mut ::c_char,
buflen: ::size_t,
result: *mut *mut ::group) -> ::c_int;
}
mod other;
pub use self::other::*;