summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2018-04-19 04:04:11 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2018-04-19 04:04:11 +0000
commit305141c6dede2ebb5e7b4c5d4c1bc547f52f3d48 (patch)
tree44d492f7c9588ef0e94571169da01b84d34ff643
parent97e0c4714859eb0f7d15e5e0eddca2a36c7360dc (diff)
parent3502b037b6e8f668ca2d2a399b567a0700cda3b3 (diff)
downloadnix-305141c6dede2ebb5e7b4c5d4c1bc547f52f3d48.zip
Merge #883
883: Expose `preadv` and `pwritev` on BSDs r=asomers a=morrowa This addresses issue #690. It exposes the `preadv` and `pwritev` functions on supported BSDs (not including Apple platforms). Co-authored-by: Andrew Morrow <andrew.d.morrow@gmail.com>
-rw-r--r--CHANGELOG.md2
-rw-r--r--src/sys/uio.rs25
2 files changed, 25 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27ae766d..e146c483 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
## [Unreleased]
### Added
+- Exposed `preadv` and `pwritev` on the BSDs.
+ ([#883](https://github.com/nix-rust/nix/pull/883))
- Added `mlockall` and `munlockall`
([#876](https://github.com/nix-rust/nix/pull/876))
- Added `SO_MARK` on Linux.
diff --git a/src/sys/uio.rs b/src/sys/uio.rs
index 5713f63c..305c2ad0 100644
--- a/src/sys/uio.rs
+++ b/src/sys/uio.rs
@@ -19,7 +19,17 @@ pub fn readv(fd: RawFd, iov: &mut [IoVec<&mut [u8]>]) -> Result<usize> {
Errno::result(res).map(|r| r as usize)
}
-#[cfg(target_os = "linux")]
+/// Write to `fd` at `offset` from buffers in `iov`.
+///
+/// Buffers in `iov` will be written in order until all buffers have been written
+/// or an error occurs. The file offset is not changed.
+///
+/// See also: [`writev`](fn.writev.html) and [`pwrite`](fn.pwrite.html)
+#[cfg(any(target_os = "dragonfly",
+ target_os = "freebsd",
+ target_os = "linux",
+ target_os = "netbsd",
+ target_os = "openbsd"))]
pub fn pwritev(fd: RawFd, iov: &[IoVec<&[u8]>],
offset: off_t) -> Result<usize> {
let res = unsafe {
@@ -29,7 +39,18 @@ pub fn pwritev(fd: RawFd, iov: &[IoVec<&[u8]>],
Errno::result(res).map(|r| r as usize)
}
-#[cfg(target_os = "linux")]
+/// Read from `fd` at `offset` filling buffers in `iov`.
+///
+/// Buffers in `iov` will be filled in order until all buffers have been filled,
+/// no more bytes are available, or an error occurs. The file offset is not
+/// changed.
+///
+/// See also: [`readv`](fn.readv.html) and [`pread`](fn.pread.html)
+#[cfg(any(target_os = "dragonfly",
+ target_os = "freebsd",
+ target_os = "linux",
+ target_os = "netbsd",
+ target_os = "openbsd"))]
pub fn preadv(fd: RawFd, iov: &mut [IoVec<&mut [u8]>],
offset: off_t) -> Result<usize> {
let res = unsafe {