Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

std: use more LFS functions on Linux #31668

Merged
merged 4 commits into from
Feb 16, 2016
Merged

std: use more LFS functions on Linux #31668

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1ea38f8
std: use LFS ftruncate64 on Linux
cuviper Feb 15, 2016
dcdfed4
std: use LFS lseek64 on Linux
cuviper Feb 15, 2016
8f2d7d9
std: use LFS readdir64_r on Linux
cuviper Feb 15, 2016
c84ab39
std: use LFS open64 on Linux
cuviper Feb 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions src/libstd/sys/unix/fs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, off_t, mode_t};
use libc::{self, c_int, mode_t};
use mem;
use path::{Path, PathBuf};
use ptr;
Expand All @@ -26,9 +26,12 @@ use sys::{cvt, cvt_r};
use sys_common::{AsInner, FromInner};

#[cfg(target_os = "linux")]
use libc::{stat64, fstat64, lstat64};
use libc::{stat64, fstat64, lstat64, off64_t, ftruncate64, lseek64, dirent64, readdir64_r, open64};
#[cfg(not(target_os = "linux"))]
use libc::{stat as stat64, fstat as fstat64, lstat as lstat64};
use libc::{stat as stat64, fstat as fstat64, lstat as lstat64, off_t as off64_t,
ftruncate as ftruncate64, lseek as lseek64, dirent as dirent64, open as open64};
#[cfg(not(any(target_os = "linux", target_os = "solaris")))]
use libc::{readdir_r as readdir64_r};

pub struct File(FileDesc);

Expand All @@ -48,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
Expand Down Expand Up @@ -223,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() {
Expand Down Expand Up @@ -394,7 +397,7 @@ impl File {
try!(opts.get_creation_mode()) |
(opts.custom_flags as c_int & !libc::O_ACCMODE);
let fd = try!(cvt_r(|| unsafe {
libc::open(path.as_ptr(), flags, opts.mode as c_int)
open64(path.as_ptr(), flags, opts.mode as c_int)
}));
let fd = FileDesc::new(fd);

Expand Down Expand Up @@ -443,7 +446,7 @@ impl File {

pub fn truncate(&self, size: u64) -> io::Result<()> {
try!(cvt_r(|| unsafe {
libc::ftruncate(self.0.raw(), size as libc::off_t)
ftruncate64(self.0.raw(), size as off64_t)
}));
Ok(())
}
Expand All @@ -460,11 +463,11 @@ impl File {

pub fn seek(&self, pos: SeekFrom) -> io::Result<u64> {
let (whence, pos) = match pos {
SeekFrom::Start(off) => (libc::SEEK_SET, off as off_t),
SeekFrom::End(off) => (libc::SEEK_END, off as off_t),
SeekFrom::Current(off) => (libc::SEEK_CUR, off as off_t),
SeekFrom::Start(off) => (libc::SEEK_SET, off as off64_t),
SeekFrom::End(off) => (libc::SEEK_END, off as off64_t),
SeekFrom::Current(off) => (libc::SEEK_CUR, off as off64_t),
};
let n = try!(cvt(unsafe { libc::lseek(self.0.raw(), pos, whence) }));
let n = try!(cvt(unsafe { lseek64(self.0.raw(), pos, whence) }));
Ok(n as u64)
}

Expand Down