Skip to content

Commit

Permalink
libstd needs update for pending libc change
Browse files Browse the repository at this point in the history
Fixes #39868
  • Loading branch information
binarycrusader committed Feb 16, 2017
1 parent 62eb605 commit ebf70a9
Showing 1 changed file with 0 additions and 11 deletions.
11 changes: 0 additions & 11 deletions src/libstd/sys/unix/os.rs
Expand Up @@ -483,7 +483,6 @@ pub fn home_dir() -> Option<PathBuf> {
target_os = "nacl",
target_os = "emscripten")))]
unsafe fn fallback() -> Option<OsString> {
#[cfg(not(target_os = "solaris"))]
unsafe fn getpwduid_r(me: libc::uid_t, passwd: &mut libc::passwd,
buf: &mut Vec<c_char>) -> Option<()> {
let mut result = ptr::null_mut();
Expand All @@ -495,16 +494,6 @@ pub fn home_dir() -> Option<PathBuf> {
}
}

#[cfg(target_os = "solaris")]
unsafe fn getpwduid_r(me: libc::uid_t, passwd: &mut libc::passwd,
buf: &mut Vec<c_char>) -> Option<()> {
// getpwuid_r semantics is different on Illumos/Solaris:
// http://illumos.org/man/3c/getpwuid_r
let result = libc::getpwuid_r(me, passwd, buf.as_mut_ptr(),
buf.capacity());
if result.is_null() { None } else { Some(()) }
}

let amt = match libc::sysconf(libc::_SC_GETPW_R_SIZE_MAX) {
n if n < 0 => 512 as usize,
n => n as usize,
Expand Down

0 comments on commit ebf70a9

Please sign in to comment.