Auto merge of rust-lang#310 - nrc:WIF, r=alexcrichton

Add more constants from sys/wait.h

And fix WIFEXITED on Linux, which seemed to be wrong.

Author: bors

src/unix/bsd/freebsdlike/mod.rs

@@ -685,6 +685,20 @@ pub const TIOCSWINSZ: ::c_ulong = 0x80087467;
 
 pub const SEM_FAILED: *mut sem_t = 0 as *mut sem_t;
 
+f! {
+    pub fn WSTOPSIG(status: ::c_int) -> ::c_int {
+        status >> 8
+    }
+
+    pub fn WIFSIGNALED(status: ::c_int) -> bool {
+        (status & 0o177) != 0o177 && (status & 0o177) != 0
+    }
+
+    pub fn WIFSTOPPED(status: ::c_int) -> bool {
+        (status & 0o177) == 0o177
+    }
+}
+
 #[link(name = "util")]
 extern {
     pub fn getnameinfo(sa: *const ::sockaddr,

src/unix/bsd/mod.rs

@@ -324,18 +324,18 @@ f! {
         }
     }
 
+    pub fn WTERMSIG(status: ::c_int) -> ::c_int {
+        status & 0o177
+    }
+
     pub fn WIFEXITED(status: ::c_int) -> bool {
-        (status & 0x7f) == 0
+        (status & 0o177) == 0
     }
 
     pub fn WEXITSTATUS(status: ::c_int) -> ::c_int {
         status >> 8
     }
 
-    pub fn WTERMSIG(status: ::c_int) -> ::c_int {
-        status & 0o177
-    }
-
     pub fn WCOREDUMP(status: ::c_int) -> bool {
         (status & 0o200) != 0
     }

src/unix/bsd/openbsdlike/mod.rs

@@ -449,6 +449,20 @@ pub const HW_NCPU: ::c_int = 3;
 
 pub const SEM_FAILED: *mut sem_t = 0 as *mut sem_t;
 
+f! {
+    pub fn WSTOPSIG(status: ::c_int) -> ::c_int {
+        status >> 8
+    }
+
+    pub fn WIFSIGNALED(status: ::c_int) -> bool {
+        (status & 0o177) != 0o177 && (status & 0o177) != 0
+    }
+
+    pub fn WIFSTOPPED(status: ::c_int) -> bool {
+        (status & 0o177) == 0o177
+    }
+}
+
 #[link(name = "util")]
 extern {
     pub fn mincore(addr: *mut ::c_void, len: ::size_t,

src/unix/notbsd/mod.rs

@@ -682,17 +682,33 @@ f! {
         }
     }
 
-    pub fn WIFEXITED(status: ::c_int) -> bool {
-        (status & 0xff) == 0
+    pub fn WIFSTOPPED(status: ::c_int) -> bool {
+        (status & 0xff) == 0x7f
     }
 
-    pub fn WEXITSTATUS(status: ::c_int) -> ::c_int {
+    pub fn WSTOPSIG(status: ::c_int) -> ::c_int {
         (status >> 8) & 0xff
     }
 
+    pub fn WIFSIGNALED(status: ::c_int) -> bool {
+        (status & 0x7f) + 1 >= 2
+    }
+
     pub fn WTERMSIG(status: ::c_int) -> ::c_int {
         status & 0x7f
     }
+
+    pub fn WIFEXITED(status: ::c_int) -> bool {
+        (status & 0x7f) == 0
+    }
+
+    pub fn WEXITSTATUS(status: ::c_int) -> ::c_int {
+        (status >> 8) & 0xff
+    }
+
+    pub fn WCOREDUMP(status: ::c_int) -> bool {
+        (status & 0x80) != 0
+    }
 }
 
 extern {