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

Use try_into and move some functions

Browse Source
This commit is contained in:
Tobias Bucher 2016-10-09 01:06:55 +02:00
parent f352f0eec0
commit 70dcfd634e
2 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libstd/sys/unix/android.rs
View File

@ -31,6 +31,7 @@
use libc::{c_int, c_void, sighandler_t, size_t, ssize_t};
use libc::{ftruncate, pread, pwrite};
use convert::TryInto;
use io;
use super::{cvt, cvt_r};
@ -121,11 +122,11 @@ pub unsafe fn cvt_pread64(fd: c_int, buf: *mut c_void, count: size_t, offset: i6
weak!(fn pread64(c_int, *mut c_void, size_t, i64) -> ssize_t);
unsafe {
pread64.get().map(|f| cvt(f(fd, buf, count, offset))).unwrap_or_else(|| {
if offset as u64 > i32::max_value() as u64 {
if let Ok(o) = offset.try_into() {
cvt(pread(fd, buf, count, o))
} else {
Err(io::Error::new(io::Error::InvalidInput,
"cannot pread >2GB"))
} else {
cvt(pread(fd, buf, count, offset as i32))
}
})
}
@ -137,11 +138,11 @@ pub unsafe fn cvt_pwrite64(fd: c_int, buf: *const c_void, count: size_t, offset:
weak!(fn pwrite64(c_int, *const c_void, size_t, i64) -> ssize_t);
unsafe {
pwrite64.get().map(|f| cvt(f(fd, buf, count, offset))).unwrap_or_else(|| {
if offset as u64 > i32::max_value() as u64 {
if let Ok(o) = offset.try_into() {
cvt(pwrite(fd, buf, count, o))
} else {
Err(io::Error::new(io::Error::InvalidInput,
"cannot pwrite >2GB"))
} else {
cvt(pwrite(fd, buf, count, offset as i32))
}
})
}

53
src/libstd/sys/unix/fd.rs
View File

@ -18,27 +18,6 @@ use sys::cvt;
use sys_common::AsInner;
use sys_common::io::read_to_end_uninitialized;
#[cfg(target_os = "android")]
use super::android::{cvt_pread64, cvt_pwrite64};
#[cfg(any(target_os = "linux", target_os = "emscripten"))]
use libc::{pread64, pwrite64, off64_t, ssize_t};
#[cfg(not(any(target_os = "linux", target_os = "emscripten", target_os = "android")))]
use libc::{pread as pread64, pwrite as pwrite64, off_t as off64_t, ssize_t};
#[cfg(not(target_os = "android"))]
unsafe fn cvt_pread64(fd: c_int, buf: *mut c_void, count: size_t, offset: off64_t)
-> io::Result<ssize_t>
{
cvt(pread64(fd, buf, count, offset))
}
#[cfg(not(target_os = "android"))]
unsafe fn cvt_pwrite64(fd: c_int, buf: *const c_void, count: size_t, offset: off64_t)
-> io::Result<ssize_t>
{
cvt(pwrite64(fd, buf, count, offset))
}
pub struct FileDesc {
fd: c_int,
}
@ -72,11 +51,25 @@ impl FileDesc {
}
pub fn read_at(&self, buf: &mut [u8], offset: u64) -> io::Result<usize> {
#[cfg(target_os = "android")]
use super::android::cvt_pread64;
#[cfg(not(target_os = "android"))]
unsafe fn cvt_pread64(fd: c_int, buf: *mut c_void, count: usize, offset: i64)
-> io::Result<isize>
{
#[cfg(any(target_os = "linux", target_os = "emscripten"))]
use libc::pread64;
#[cfg(not(any(target_os = "linux", target_os = "emscripten")))]
use libc::pread as pread64;
cvt(pread64(fd, buf, count, offset))
}
unsafe {
cvt_pread64(self.fd,
buf.as_mut_ptr() as *mut c_void,
buf.len(),
offset as off64_t)
offset as i64)
.map(|n| n as usize)
}
}
@ -91,11 +84,25 @@ impl FileDesc {
}
pub fn write_at(&self, buf: &[u8], offset: u64) -> io::Result<usize> {
#[cfg(target_os = "android")]
use super::android::cvt_pwrite64;
#[cfg(not(target_os = "android"))]
unsafe fn cvt_pwrite64(fd: c_int, buf: *const c_void, count: usize, offset: i64)
-> io::Result<isize>
{
#[cfg(any(target_os = "linux", target_os = "emscripten"))]
use libc::pwrite64;
#[cfg(not(any(target_os = "linux", target_os = "emscripten")))]
use libc::pwrite as pwrite64;
cvt(pwrite64(fd, buf, count, offset))
}
unsafe {
cvt_pwrite64(self.fd,
buf.as_ptr() as *const c_void,
buf.len(),
offset as off64_t)
offset as i64)
.map(|n| n as usize)
}
}