Merge branch 'master' into support-getifaddrs

Author: Markus Wanner (mwa)

.gitattributes

@@ -0,0 +1 @@
+/CHANGELOG.md merge=union

.travis.yml

@@ -12,7 +12,9 @@ env:
 
 matrix:
   # These are all the build jobs. Adjust as necessary. Comment out what you
-  # don't need
+  # don't need. The iOS/Mac builds are distributed throughout because Travis
+  # likes to have a big backlog on builds on those machines. This way at least
+  # all of the other jobs can finish while waiting on those builds.
   include:
     # Android
     - env: TARGET=aarch64-linux-android DISABLE_TESTS=1
@@ -21,91 +23,85 @@ matrix:
       rust: 1.13.0
     - env: TARGET=armv7-linux-androideabi DISABLE_TESTS=1
       rust: 1.13.0
+    - env: TARGET=aarch64-apple-ios DISABLE_TESTS=1
+      rust: 1.13.0
+      os: osx
     - env: TARGET=i686-linux-android DISABLE_TESTS=1
       rust: 1.18.0
     - env: TARGET=x86_64-linux-android DISABLE_TESTS=1
       rust: 1.18.0
 
-    # iOS
-    - env: TARGET=aarch64-apple-ios DISABLE_TESTS=1
+    # Linux
+    - env: TARGET=aarch64-unknown-linux-gnu
       rust: 1.13.0
-      os: osx
     - env: TARGET=armv7-apple-ios DISABLE_TESTS=1
       rust: 1.13.0
       os: osx
-    - env: TARGET=armv7s-apple-ios DISABLE_TESTS=1
-      rust: 1.13.0
-      os: osx
-    - env: TARGET=i386-apple-ios DISABLE_TESTS=1
-      rust: 1.13.0
-      os: osx
-    - env: TARGET=x86_64-apple-ios DISABLE_TESTS=1
-      rust: 1.13.0
-      os: osx
-
-    # Linux
-    - env: TARGET=aarch64-unknown-linux-gnu
-      rust: 1.13.0
     - env: TARGET=arm-unknown-linux-gnueabi
       rust: 1.13.0
-    - env: TARGET=arm-unknown-linux-musleabi
+    - env: TARGET=arm-unknown-linux-musleabi DISABLE_TESTS=1
       rust: 1.14.0
     - env: TARGET=armv7-unknown-linux-gnueabihf
       rust: 1.13.0
+    - env: TARGET=armv7s-apple-ios DISABLE_TESTS=1
+      rust: 1.13.0
+      os: osx
     - env: TARGET=i686-unknown-linux-gnu
       rust: 1.13.0
     - env: TARGET=i686-unknown-linux-musl
       rust: 1.13.0
     - env: TARGET=mips-unknown-linux-gnu
       rust: 1.13.0
+    - env: TARGET=i386-apple-ios DISABLE_TESTS=1
+      rust: 1.13.0
+      os: osx
     - env: TARGET=mips64-unknown-linux-gnuabi64
       rust: 1.13.0
     - env: TARGET=mips64el-unknown-linux-gnuabi64
       rust: 1.13.0
     - env: TARGET=mipsel-unknown-linux-gnu
       rust: 1.13.0
-    - env: TARGET=powerpc-unknown-linux-gnu
+    - env: TARGET=x86_64-apple-ios DISABLE_TESTS=1
+      rust: 1.13.0
+      os: osx
+    - env: TARGET=powerpc-unknown-linux-gnu DISABLE_TESTS=1
       rust: 1.13.0
     - env: TARGET=powerpc64-unknown-linux-gnu
       rust: 1.13.0
     - env: TARGET=powerpc64le-unknown-linux-gnu
       rust: 1.13.0
-    - env: TARGET=s390x-unknown-linux-gnu
+    - env: TARGET=i686-apple-darwin
+      rust: 1.13.0
+      os: osx
+    - env: TARGET=s390x-unknown-linux-gnu DISABLE_TESTS=1
       rust: 1.13.0
     - env: TARGET=x86_64-unknown-linux-gnu
       rust: 1.13.0
     - env: TARGET=x86_64-unknown-linux-musl
       rust: 1.13.0
 
-    # OSX
-    - env: TARGET=i686-apple-darwin
+    # *BSD
+    # FreeBSD i686 and x86_64 use BuildBot instead of Travis
+    # Note that i686-unknown-freebsd is actually using stable Rust instead of
+    # 1.13.0 because rustup does not support i686-unknown-freebsd
+    # - env: TARGET=i686-unknown-freebsd DISABLE_TESTS=1
+    # - env: TARGET=x86_64-unknown-freebsd DISABLE_TESTS=1
+    - env: TARGET=x86_64-unknown-netbsd DISABLE_TESTS=1
       rust: 1.13.0
-      os: osx
+
     - env: TARGET=x86_64-apple-darwin
       rust: 1.13.0
       os: osx
 
-    # *BSD
-    - env: TARGET=i686-unknown-freebsd DISABLE_TESTS=1
-      rust: 1.13.0
-    # - env: TARGET=x86_64-unknown-freebsd DISABLE_TESTS=1 # Uses BuildBot instead
-    - env: TARGET=x86_64-unknown-netbsd DISABLE_TESTS=1
-      rust: 1.13.0
-
     # Testing beta on main targets
     - env: TARGET=x86_64-unknown-linux-gnu
       rust: beta
 
   allow_failures:
-    # Planning to add these targets, but they can fail for now
-    - env: TARGET=mips64-unknown-linux-gnuabi64
-      rust: 1.13.0
-    - env: TARGET=mips64el-unknown-linux-gnuabi64
-      rust: 1.13.0
-    - env: TARGET=arm-unknown-linux-musleabi
-      rust: 1.14.0
-    - env: TARGET=s390x-unknown-linux-gnu
-      rust: 1.13.0
+    # We allow beta to fail here because a bug might crop up in rust that causes it. We will
+    # however be on the lookout for this and file those bugs with upstream.
+    - env: TARGET=x86_64-unknown-linux-gnu
+      rust: beta
 
 before_install: set -e
 

CHANGELOG.md

@@ -5,6 +5,74 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Added
+- Added specialized wrappers: `sys::ptrace::{traceme, syscall, cont, attach}`. Using the matching routines
+  with `sys::ptrace::ptrace` is now deprecated.
+- Added `nix::poll` module for all platforms
+  ([#672](https://github.com/nix-rust/nix/pull/672))
+- Added `nix::ppoll` function for FreeBSD and DragonFly
+  ([#672](https://github.com/nix-rust/nix/pull/672))
+- Added protocol families in `AddressFamily` enum.
+  ([#647](https://github.com/nix-rust/nix/pull/647))
+- Added the `pid()` method to `WaitStatus` for extracting the PID.
+  ([#722](https://github.com/nix-rust/nix/pull/722))
+- Added `nix::unistd:fexecve`.
+  ([#727](https://github.com/nix-rust/nix/pull/727))
+- Expose `uname()` on all platforms.
+  ([#739](https://github.com/nix-rust/nix/pull/739))
+- Expose `signalfd` module on Android as well.
+  ([#739](https://github.com/nix-rust/nix/pull/739))
+- Added nix::sys::ptrace::detach. 
+  ([#749](https://github.com/nix-rust/nix/pull/749))
+- Added timestamp socket control message variant:
+  `nix::sys::socket::ControlMessage::ScmTimestamp`
+  ([#663](https://github.com/nix-rust/nix/pull/663))
+- Added socket option variant that enables the timestamp socket
+  control message: `nix::sys::socket::sockopt::ReceiveTimestamp`
+  ([#663](https://github.com/nix-rust/nix/pull/663))
+
+### Changed
+- Renamed existing `ptrace` wrappers to encourage namespacing ([#692](https://github.com/nix-rust/nix/pull/692))
+- Marked `sys::ptrace::ptrace` as `unsafe`.
+- Changed function signature of `socket()` and `socketpair()`. The `protocol` argument
+  has changed type from `c_int` to `SockProtocol`.
+  It accepts a `None` value for default protocol that was specified with zero using `c_int`.
+  ([#647](https://github.com/nix-rust/nix/pull/647))
+- Made `select` easier to use, adding the ability to automatically calculate the `nfds` parameter using the new
+  `FdSet::highest` ([#701](https://github.com/nix-rust/nix/pull/701))
+- Exposed `unistd::setresuid` and `unistd::setresgid` on FreeBSD and OpenBSD
+  ([#721](https://github.com/nix-rust/nix/pull/721))
+- Refactored the `statvfs` module removing extraneous API functions and the
+  `statvfs::vfs` module. Additionally  `(f)statvfs()` now return the struct
+  directly. And the returned `Statvfs` struct now exposes its data through
+  accessor methods. ([#729](https://github.com/nix-rust/nix/pull/729))
+- The `addr` argument to `madvise` and `msync` is now `*mut` to better match the
+  libc API. ([#731](https://github.com/nix-rust/nix/pull/731))
+- `shm_open` and `shm_unlink` are no longer exposed on Android targets, where
+  they are not officially supported. ([#731](https://github.com/nix-rust/nix/pull/731))
+- `MapFlags`, `MmapAdvise`, and `MsFlags` expose some more variants and only
+  officially-supported variants are provided for each target.
+  ([#731](https://github.com/nix-rust/nix/pull/731))
+- Marked `pty::ptsname` function as `unsafe`
+  ([#744](https://github.com/nix-rust/nix/pull/744))
+- Moved constants ptrace request, event and options to enums and updated ptrace functions and argument types accordingly. 
+  ([#749](https://github.com/nix-rust/nix/pull/749))
+- `AioCb::Drop` will now panic if the `AioCb` is still in-progress ([#715](https://github.com/nix-rust/nix/pull/715))
+
+# Fixed
+- Fix compilation and tests for OpenBSD targets
+  ([#688](https://github.com/nix-rust/nix/pull/688))
+- Fixed error handling in `AioCb::fsync`, `AioCb::read`, and `AioCb::write`.
+  It is no longer an error to drop an `AioCb` that failed to enqueue in the OS.
+  ([#715](https://github.com/nix-rust/nix/pull/715))
+
+# Removed
+- The syscall module has been removed. This only exposed enough functionality for
+  `memfd_create()` and `pivot_root()`, which are still exposed as separate functions.
+  ([#747](https://github.com/nix-rust/nix/pull/747))
+
+## [0.9.0] 2017-07-23
+
 ### Added
 - Added `sysconf`, `pathconf`, and `fpathconf`
   ([#630](https://github.com/nix-rust/nix/pull/630)
@@ -24,11 +92,17 @@ This project adheres to [Semantic Versioning](http://semver.org/).
   and nix::Error::UnsupportedOperation}`
   ([#614](https://github.com/nix-rust/nix/pull/614))
 - Added `cfmakeraw`, `cfsetspeed`, and `tcgetsid`. ([#527](https://github.com/nix-rust/nix/pull/527))
+- Added "bad none", "bad write_ptr", "bad write_int", and "bad readwrite" variants to the `ioctl!`
+  macro. ([#670](https://github.com/nix-rust/nix/pull/670))
+- On Linux and Android, added support for receiving `PTRACE_O_TRACESYSGOOD`
+  events from `wait` and `waitpid` using `WaitStatus::PtraceSyscall`
+  ([#566](https://github.com/nix-rust/nix/pull/566)).
 
 ### Changed
-- Changed `ioctl!(write ...)` to take argument by value instead as pointer.
-  If you need a pointer as argument, use `ioctl!(write buf ...)`.
-  ([#626](https://github.com/nix-rust/nix/pull/626))
+- The `ioctl!` macro and its variants now allow the generated functions to have
+  doccomments. ([#661](https://github.com/nix-rust/nix/pull/661))
+- Changed `ioctl!(write ...)` into `ioctl!(write_ptr ...)` and `ioctl!(write_int ..)` variants
+  to more clearly separate those use cases. ([#670](https://github.com/nix-rust/nix/pull/670))
 - Marked `sys::mman::{ mmap, munmap, madvise, munlock, msync }` as unsafe.
   ([#559](https://github.com/nix-rust/nix/pull/559))
 - Minimum supported Rust version is now 1.13.
@@ -46,10 +120,23 @@ This project adheres to [Semantic Versioning](http://semver.org/).
   Also file system type constants like `nix::sys::statfs::ADFS_SUPER_MAGIC` were removed in favor of the libc equivalent.
   ([#561](https://github.com/nix-rust/nix/pull/561))
 - Revised the termios API including additional tests and documentation and exposed it on iOS. ([#527](https://github.com/nix-rust/nix/pull/527))
+- `eventfd`, `signalfd`, and `pwritev`/`preadv` functionality is now included by default for all
+  supported platforms. ([#681](https://github.com/nix-rust/nix/pull/561))
+- The `ioctl!` macro's plain variants has been replaced with "bad read" to be consistent with
+  other variants. The generated functions also have more strict types for their arguments. The
+  "*_buf" variants also now calculate total array size and take slice references for improved type
+  safety. The documentation has also been dramatically improved.
+  ([#670](https://github.com/nix-rust/nix/pull/670))
 
 ### Removed
 - Removed `io::Error` from `nix::Error` and the conversion from `nix::Error` to `Errno`
   ([#614](https://github.com/nix-rust/nix/pull/614))
+- All feature flags have been removed in favor of conditional compilation on supported platforms.
+  `execvpe` is no longer supported, but this was already broken and will be added back in the next
+  release. ([#681](https://github.com/nix-rust/nix/pull/561))
+- Removed `ioc_*` functions and many helper constants and macros within the `ioctl` module. These
+  should always have been private and only the `ioctl!` should be used in public code.
+  ([#670](https://github.com/nix-rust/nix/pull/670))
 
 ### Fixed
 - Fixed multiple issues compiling under different archetectures and OSes.
@@ -68,6 +155,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
   ([#623](https://github.com/nix-rust/nix/pull/623))
 - Multiple constants related to the termios API have now been properly defined for
   all supported platforms. ([#527](https://github.com/nix-rust/nix/pull/527))
+- `ioctl!` macro now supports working with non-int datatypes and properly supports all platforms.
+  ([#670](https://github.com/nix-rust/nix/pull/670))
 
 ## [0.8.1] 2017-04-16
 

CONVENTIONS.md

@@ -52,15 +52,15 @@ For example,
 
 ```rust
 libc_bitflags!{
-    pub flags ProtFlags: libc::c_int {
-        PROT_NONE,
-        PROT_READ,
-        PROT_WRITE,
-        PROT_EXEC,
+    pub struct ProtFlags: libc::c_int {
+        PROT_NONE;
+        PROT_READ;
+        PROT_WRITE;
+        PROT_EXEC;
         #[cfg(any(target_os = "linux", target_os = "android"))]
-        PROT_GROWSDOWN,
+        PROT_GROWSDOWN;
         #[cfg(any(target_os = "linux", target_os = "android"))]
-        PROT_GROWSUP,
+        PROT_GROWSUP;
     }
 }
 ```

Cargo.toml

@@ -2,9 +2,8 @@
 
 name        = "nix"
 description = "Rust friendly bindings to *nix APIs"
-version     = "0.9.0-pre"
+version     = "0.10.0-pre"
 authors     = ["The nix-rust Project Developers"]
-homepage    = "https://github.com/nix-rust/nix"
 repository  = "https://github.com/nix-rust/nix"
 license     = "MIT"
 categories  = ["os::unix-apis"]
@@ -15,14 +14,8 @@ exclude     = [
   "test/**/*"
 ]
 
-[features]
-eventfd = []
-execvpe = []
-preadv_pwritev = []
-signalfd = []
-
 [dependencies]
-libc = "0.2.25"
+libc = { git = "https://github.com/rust-lang/libc" }
 bitflags = "0.9"
 cfg-if = "0.1.0"
 void = "1.0.2"
@@ -39,10 +32,8 @@ name = "test"
 path = "test/test.rs"
 
 [[test]]
-name = "test-signalfd"
-path = "test/test_signalfd.rs"
-harness = false
-test = true
+name = "test-aio-drop"
+path = "test/sys/test_aio_drop.rs"
 
 [[test]]
 name = "test-mount"

README.md

@@ -57,8 +57,9 @@ Tier 1:
   * i686-unknown-linux-gnu
   * i686-unknown-linux-musl
   * mips-unknown-linux-gnu
+  * mips64-unknown-linux-gnuabi64
+  * mips64el-unknown-linux-gnuabi64
   * mipsel-unknown-linux-gnu
-  * powerpc-unknown-linux-gnu
   * powerpc64-unknown-linux-gnu
   * powerpc64le-unknown-linux-gnu
   * x86_64-apple-darwin
@@ -70,29 +71,26 @@ Tier 2:
   * aarch64-apple-ios
   * aarch64-linux-android
   * arm-linux-androideabi
+  * arm-unknown-linux-musleabi (requires Rust >= 1.14)
   * armv7-apple-ios
   * armv7-linux-androideabi
   * armv7s-apple-ios
   * i386-apple-ios
   * i686-linux-android (requires Rust >= 1.18)
   * i686-unknown-freebsd
+  * powerpc-unknown-linux-gnu
+  * s390x-unknown-linux-gnu
   * x86_64-apple-ios
   * x86_64-linux-android (requires Rust >= 1.18)
   * x86_64-unknown-netbsd
 
-Tier 3:
-  * arm-unknown-linux-musleabi (requires Rust >= 1.14)
-  * mips64-unknown-linux-gnuabi64
-  * mips64el-unknown-linux-gnuabi64
-  * s390x-unknown-linux-gnu
-
 ## Usage
 
 To use `nix`, first add this to your `Cargo.toml`:
 
 ```toml
 [dependencies]
-nix = "0.8.0"
+nix = "0.9.0"
 ```
 
 Then, add this to your crate root:

bors.toml

@@ -1,6 +1,7 @@
 # Gate on Travis CI and Buildbot
 status = ["continuous-integration/travis-ci/push",
-          "buildbot/nix-rust/nix fbsd11"]
+          "buildbot/nix-rust/nix amd64_fbsd11",
+          "buildbot/nix-rust/nix i386_fbsd11"]
 
 # Set bors's timeout to 4 hours
 #