diff options
| author | Shawn Walker-Salas <shawn.walker@oracle.com> | 2017-02-15 17:48:20 -0800 | 
|---|---|---|
| committer | Shawn Walker-Salas <shawn.walker@oracle.com> | 2017-02-15 17:52:24 -0800 | 
| commit | ebf70a9a206e3ecff7d442a7edf297731e9fe042 (patch) | |
| tree | dc68a05c58792531e25a66e91f0221d39008a42e /src/libstd/sys/unix | |
| parent | 62eb6056d332be09206dc664f2e949ae64341e64 (diff) | |
| download | rust-ebf70a9a206e3ecff7d442a7edf297731e9fe042.tar.gz rust-ebf70a9a206e3ecff7d442a7edf297731e9fe042.zip  | |
libstd needs update for pending libc change
Fixes #39868
Diffstat (limited to 'src/libstd/sys/unix')
| -rw-r--r-- | src/libstd/sys/unix/os.rs | 11 | 
1 files changed, 0 insertions, 11 deletions
diff --git a/src/libstd/sys/unix/os.rs b/src/libstd/sys/unix/os.rs index 6992a17832e..1dbfa640d52 100644 --- a/src/libstd/sys/unix/os.rs +++ b/src/libstd/sys/unix/os.rs @@ -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(); @@ -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,  | 
