OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

std: use LFS readdir64_r on Linux

This commit is contained in:
Josh Stone 2016-02-14 16:24:02 -08:00
parent dcdfed49d7
commit 8f2d7d956c
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libstd/sys/unix/fs.rs
View File

@ -15,7 +15,7 @@ use os::unix::prelude::*;
use ffi::{CString, CStr, OsString, OsStr};
use fmt;
use io::{self, Error, ErrorKind, SeekFrom};
use libc::{self, dirent, c_int, mode_t};
use libc::{self, c_int, mode_t};
use mem;
use path::{Path, PathBuf};
use ptr;
@ -26,10 +26,12 @@ use sys::{cvt, cvt_r};
use sys_common::{AsInner, FromInner};
#[cfg(target_os = "linux")]
use libc::{stat64, fstat64, lstat64, off64_t, ftruncate64, lseek64};
use libc::{stat64, fstat64, lstat64, off64_t, ftruncate64, lseek64, dirent64, readdir64_r};
#[cfg(not(target_os = "linux"))]
use libc::{stat as stat64, fstat as fstat64, lstat as lstat64, off_t as off64_t,
ftruncate as ftruncate64, lseek as lseek64};
ftruncate as ftruncate64, lseek as lseek64, dirent as dirent64};
#[cfg(not(any(target_os = "linux", target_os = "solaris")))]
use libc::{readdir_r as readdir64_r};
pub struct File(FileDesc);
@ -49,7 +51,7 @@ unsafe impl Send for Dir {}
unsafe impl Sync for Dir {}
pub struct DirEntry {
entry: dirent,
entry: dirent64,
root: Arc<PathBuf>,
// We need to store an owned copy of the directory name
// on Solaris because a) it uses a zero-length array to
@ -224,7 +226,7 @@ impl Iterator for ReadDir {
};
let mut entry_ptr = ptr::null_mut();
loop {
if libc::readdir_r(self.dirp.0, &mut ret.entry, &mut entry_ptr) != 0 {
if readdir64_r(self.dirp.0, &mut ret.entry, &mut entry_ptr) != 0 {
return Some(Err(Error::last_os_error()))
}
if entry_ptr.is_null() {