From e43d7db9bf1b9c9522aa00d0e7c3cc9f6feea237 Mon Sep 17 00:00:00 2001
From: William Orr <will@worrbase.com>
Date: Sun, 5 Nov 2017 22:39:25 -0800
Subject: Omit invalid waitpid flags on OpenBSD

OpenBSD doesn't have `WEXITED`, `WSTOPPED`, or `WNOWAIT`, so omit those
from that platform.
---
 src/sys/wait.rs | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/sys/wait.rs b/src/sys/wait.rs
index ec1241be..29822c02 100644
--- a/src/sys/wait.rs
+++ b/src/sys/wait.rs
@@ -8,10 +8,31 @@ libc_bitflags!(
     pub struct WaitPidFlag: c_int {
         WNOHANG;
         WUNTRACED;
+        #[cfg(any(target_os = "android",
+                  target_os = "freebsd",
+                  target_os = "haiku",
+                  target_os = "ios",
+                  target_os = "linux",
+                  target_os = "macos",
+                  target_os = "netbsd"))]
         WEXITED;
         WCONTINUED;
+        #[cfg(any(target_os = "android",
+                  target_os = "freebsd",
+                  target_os = "haiku",
+                  target_os = "ios",
+                  target_os = "linux",
+                  target_os = "macos",
+                  target_os = "netbsd"))]
         WSTOPPED;
         /// Don't reap, just poll status.
+        #[cfg(any(target_os = "android",
+                  target_os = "freebsd",
+                  target_os = "haiku",
+                  target_os = "ios",
+                  target_os = "linux",
+                  target_os = "macos",
+                  target_os = "netbsd"))]
         WNOWAIT;
         /// Don't wait on children of other threads in this group
         #[cfg(any(target_os = "android", target_os = "linux"))]
-- 
cgit v1.2.3


From ecd0954394ce56829ad7ea2969b4ce031ab6eade Mon Sep 17 00:00:00 2001
From: William Orr <will@worrbase.com>
Date: Sun, 5 Nov 2017 22:40:57 -0800
Subject: Formatting with rustfmt

---
 src/sys/wait.rs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/sys/wait.rs b/src/sys/wait.rs
index 29822c02..019b751f 100644
--- a/src/sys/wait.rs
+++ b/src/sys/wait.rs
@@ -95,7 +95,7 @@ pub enum WaitStatus {
     /// child process. This is only returned if `WaitPidFlag::WNOHANG`
     /// was used (otherwise `wait()` or `waitpid()` would block until
     /// there was something to report).
-    StillAlive
+    StillAlive,
 }
 
 impl WaitStatus {
@@ -161,7 +161,7 @@ fn continued(status: i32) -> bool {
     unsafe { libc::WIFCONTINUED(status) }
 }
 
-fn decode(pid : Pid, status: i32) -> WaitStatus {
+fn decode(pid: Pid, status: i32) -> WaitStatus {
     if exited(status) {
         WaitStatus::Exited(pid, exit_status(status))
     } else if signaled(status) {
@@ -199,10 +199,16 @@ pub fn waitpid<P: Into<Option<Pid>>>(pid: P, options: Option<WaitPidFlag>) -> Re
 
     let option_bits = match options {
         Some(bits) => bits.bits(),
-        None => 0
+        None => 0,
     };
 
-    let res = unsafe { libc::waitpid(pid.into().unwrap_or(Pid::from_raw(-1)).into(), &mut status as *mut c_int, option_bits) };
+    let res = unsafe {
+        libc::waitpid(
+            pid.into().unwrap_or(Pid::from_raw(-1)).into(),
+            &mut status as *mut c_int,
+            option_bits,
+        )
+    };
 
     Ok(match try!(Errno::result(res)) {
         0 => StillAlive,
-- 
cgit v1.2.3