Skip to content

Commit

Permalink
Merge #1284
Browse files Browse the repository at this point in the history
1284: Expose SeekData and SeekHole on all Linux targets r=asomers a=Amanieu

These were previously missing on musl and mips targets because of
missing definitions in the libc crate.

Co-authored-by: Amanieu d'Antras <amanieu@gmail.com>
Co-authored-by: Alan Somers <asomers@gmail.com>
  • Loading branch information
3 people committed Aug 22, 2020
2 parents 8ab88ee + baab9c4 commit 645309d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased] - ReleaseDate
### Added
- Added Netlink protocol families to the `SockProtocol` enum
(#[1289](https://github.com/nix-rust/nix/pull/1289))
### Added
### Changed
- Expose `SeekData` and `SeekHole` on all Linux targets
(#[1284](https://github.com/nix-rust/nix/pull/1284))
- Changed unistd::{execv,execve,execvp,execvpe,fexecve,execveat} to take both `&[&CStr]` and `&[CString]` as its list argument(s).
(#[1278](https://github.com/nix-rust/nix/pull/1278))
### Fixed
Expand Down
10 changes: 2 additions & 8 deletions src/unistd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1018,20 +1018,14 @@ pub enum Whence {
/// Specify an offset relative to the next location in the file greater than or
/// equal to offset that contains some data. If offset points to
/// some data, then the file offset is set to offset.
#[cfg(any(target_os = "dragonfly", target_os = "freebsd",
all(target_os = "linux", not(any(target_env = "musl",
target_arch = "mips",
target_arch = "mips64")))))]
#[cfg(any(target_os = "dragonfly", target_os = "freebsd", target_os = "linux"))]
SeekData = libc::SEEK_DATA,
/// Specify an offset relative to the next hole in the file greater than
/// or equal to offset. If offset points into the middle of a hole, then
/// the file offset should be set to offset. If there is no hole past offset,
/// then the file offset should be adjusted to the end of the file (i.e., there
/// is an implicit hole at the end of any file).
#[cfg(any(target_os = "dragonfly", target_os = "freebsd",
all(target_os = "linux", not(any(target_env = "musl",
target_arch = "mips",
target_arch = "mips64")))))]
#[cfg(any(target_os = "dragonfly", target_os = "freebsd", target_os = "linux"))]
SeekHole = libc::SEEK_HOLE
}

Expand Down

0 comments on commit 645309d

Please sign in to comment.