Make sigset_t be a long because bash needs that to compile

include/bits/signal.h

@@ -1,6 +1,3 @@
-#define SIG_ERR -1ULL
-
-#define NSIG 64
-
-// darn cbindgen
-typedef unsigned long sigset_t[NSIG / (8 * sizeof(unsigned long))];
+#define SIG_ERR ((void (*)(int)) -1)
+#define SIG_DFL ((void (*)(int)) 0)
+#define SIG_IGN ((void (*)(int)) 1)

src/platform/src/redox/mod.rs

@@ -736,7 +736,7 @@ pub unsafe fn sigaction(sig: c_int, act: *const sigaction, oact: *mut sigaction)
         let m = (*act).sa_mask;
         Some(syscall::SigAction {
             sa_handler: sig_handler,
-            sa_mask: [m[0] as u64, 0],
+            sa_mask: [0, m as u64],
             sa_flags: (*act).sa_flags as usize
         })
     };
@@ -748,7 +748,7 @@ pub unsafe fn sigaction(sig: c_int, act: *const sigaction, oact: *mut sigaction)
     )) as c_int;
     if !oact.is_null() {
         let m = old.sa_mask;
-        (*oact).sa_mask = [m[0] as c_ulong];
+        (*oact).sa_mask = m[1] as c_ulong;
         (*oact).sa_flags = old.sa_flags as c_ulong;
     }
     ret

src/platform/src/types.rs

@@ -172,8 +172,7 @@ pub struct sigaction {
     pub sa_mask: sigset_t
 }
 
-pub const NSIG: usize = 64;
-pub type sigset_t = [c_ulong; NSIG / (8 * mem::size_of::<c_ulong>())];
+pub type sigset_t = c_ulong;
 
 const UTSLENGTH: usize = 65;
 

src/signal/src/lib.rs

@@ -14,6 +14,11 @@ pub mod sys;
 #[path = "redox.rs"]
 pub mod sys;
 
+pub use sys::*;
+
+use core::{mem, ptr};
+use platform::types::*;
+
 const SIG_ERR: usize = !0;
 
 pub const SIG_BLOCK: c_int = 0;
@@ -30,10 +35,8 @@ pub struct sigaction {
     pub sa_mask: sigset_t
 }
 
-pub use sys::*;
-
-use core::{mem, ptr};
-use platform::types::*;
+pub const NSIG: usize = 64;
+pub type sigset_t = c_ulong;
 
 #[no_mangle]
 pub extern "C" fn kill(pid: pid_t, sig: c_int) -> c_int {
@@ -73,9 +76,9 @@ pub extern "C" fn sigaddset(set: *mut sigset_t, mut signo: c_int) -> c_int {
     }
 
     let signo = signo as usize - 1; // 0-indexed usize, please!
-
-    let bits_each = 8 * mem::size_of::<sigset_t>();
-    (unsafe { *set })[signo / bits_each] = 1 << (signo & (bits_each - 1));
+    unsafe {
+        *set |= 1 << (signo & (8 * mem::size_of::<sigset_t>() - 1));
+    }
     0
 }
 
@@ -86,16 +89,16 @@ pub extern "C" fn sigdelset(set: *mut sigset_t, signo: c_int) -> c_int {
 
 #[no_mangle]
 pub extern "C" fn sigemptyset(set: *mut sigset_t) -> c_int {
-    for i in unsafe { &mut (*set) } {
-        *i = 0;
+    unsafe {
+        *set = 0;
     }
     0
 }
 
 #[no_mangle]
 pub extern "C" fn sigfillset(set: *mut sigset_t) -> c_int {
-    for i in unsafe { &mut (*set) } {
-        *i = c_ulong::max_value();
+    unsafe {
+        *set = c_ulong::max_value();
     }
     0
 }

src/sys_socket/cbindgen.toml

@@ -1,4 +1,4 @@
-sys_includes = ["sys/types.h"]
+sys_includes = ["stddef.h", "sys/types.h"]
 include_guard = "_SYS_SOCKET_H"
 style = "Tag"
 language = "C"