From a1de0ef8a1eb442a12ec16cb40b1a37c881fe2be Mon Sep 17 00:00:00 2001 From: Andrii Zymohliad Date: Mon, 12 Mar 2018 14:55:02 +0800 Subject: [PATCH 1/6] Implement strstr(), add strstr test --- src/string/src/lib.rs | 18 ++++++++++++++++-- tests/Makefile | 1 + tests/expected/string/strstr.stderr | 0 tests/expected/string/strstr.stdout | 3 +++ tests/string/strstr.c | 18 ++++++++++++++++++ 5 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 tests/expected/string/strstr.stderr create mode 100644 tests/expected/string/strstr.stdout create mode 100644 tests/string/strstr.c diff --git a/src/string/src/lib.rs b/src/string/src/lib.rs index ca56dff001..04b8c93bcd 100644 --- a/src/string/src/lib.rs +++ b/src/string/src/lib.rs @@ -299,8 +299,22 @@ pub unsafe extern "C" fn strspn(s1: *const c_char, s2: *const c_char) -> c_ulong } #[no_mangle] -pub extern "C" fn strstr(s1: *const c_char, s2: *const c_char) -> *mut c_char { - unimplemented!(); +pub unsafe extern "C" fn strstr(s1: *const c_char, s2: *const c_char) -> *mut c_char { + let mut i = 0; + while *s1.offset(i) != 0 { + let mut j = 0; + while *s2.offset(j) != 0 && *s1.offset(j + i) != 0 { + if *s2.offset(j) != *s1.offset(j + i) { + break; + } + j += 1; + if *s2.offset(j) == 0 { + return s1.offset(i) as *mut c_char; + } + } + i += 1; + } + ptr::null_mut() } #[no_mangle] diff --git a/tests/Makefile b/tests/Makefile index a252889605..ecd259335b 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -27,6 +27,7 @@ EXPECT_BINS=\ string/strchr \ string/strrchr \ string/strspn \ + string/strstr \ unlink \ write diff --git a/tests/expected/string/strstr.stderr b/tests/expected/string/strstr.stderr new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/string/strstr.stdout b/tests/expected/string/strstr.stdout new file mode 100644 index 0000000000..e978edff7f --- /dev/null +++ b/tests/expected/string/strstr.stdout @@ -0,0 +1,3 @@ +rust +libc we trust +NULL diff --git a/tests/string/strstr.c b/tests/string/strstr.c new file mode 100644 index 0000000000..1f6796a2f1 --- /dev/null +++ b/tests/string/strstr.c @@ -0,0 +1,18 @@ +#include +#include + +int main(int argc, char* argv[]) { + // should be "rust" + char* str1 = strstr("In relibc we trust", "rust"); + printf("%s\n", (str1) ? str1 : "NULL"); + + // should be "libc we trust" + char* str2 = strstr("In relibc we trust", "libc"); + printf("%s\n", (str2) ? str2 : "NULL"); + + // should be "NULL" + char* str3 = strstr("In relibc we trust", "bugs"); + printf("%s\n", (str3) ? str3 : "NULL"); + + return 0; +} From 1e969afd43b83477a2251e72400970d690d058b8 Mon Sep 17 00:00:00 2001 From: Andrii Zymohliad Date: Mon, 12 Mar 2018 18:01:12 +0800 Subject: [PATCH 2/6] Implement strpbrk(), add strpbrk test --- src/string/src/lib.rs | 11 +++++++++-- tests/Makefile | 1 + tests/expected/string/strpbrk.stderr | 0 tests/expected/string/strpbrk.stdout | 3 +++ tests/string/strpbrk.c | 21 +++++++++++++++++++++ 5 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 tests/expected/string/strpbrk.stderr create mode 100644 tests/expected/string/strpbrk.stdout create mode 100644 tests/string/strpbrk.c diff --git a/src/string/src/lib.rs b/src/string/src/lib.rs index 04b8c93bcd..ef348830ee 100644 --- a/src/string/src/lib.rs +++ b/src/string/src/lib.rs @@ -250,8 +250,15 @@ pub unsafe extern "C" fn strncpy(s1: *mut c_char, s2: *const c_char, n: usize) - } #[no_mangle] -pub extern "C" fn strpbrk(s1: *const c_char, s2: *const c_char) -> *mut c_char { - unimplemented!(); +pub unsafe extern "C" fn strpbrk(s1: *const c_char, s2: *const c_char) -> *mut c_char { + let mut i = 0; + while *s1.offset(i) != 0 { + if !strchr(s2, *s1.offset(i) as i32).is_null() { + return s1.offset(i) as *mut c_char; + } + i += 1; + } + ptr::null_mut() } #[no_mangle] diff --git a/tests/Makefile b/tests/Makefile index ecd259335b..351d48df23 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -28,6 +28,7 @@ EXPECT_BINS=\ string/strrchr \ string/strspn \ string/strstr \ + string/strpbrk \ unlink \ write diff --git a/tests/expected/string/strpbrk.stderr b/tests/expected/string/strpbrk.stderr new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/string/strpbrk.stdout b/tests/expected/string/strpbrk.stdout new file mode 100644 index 0000000000..7a6bc8b089 --- /dev/null +++ b/tests/expected/string/strpbrk.stdout @@ -0,0 +1,3 @@ +The quick drawn fix jumps over the lazy bug +lazy bug +NULL diff --git a/tests/string/strpbrk.c b/tests/string/strpbrk.c new file mode 100644 index 0000000000..40cae665b1 --- /dev/null +++ b/tests/string/strpbrk.c @@ -0,0 +1,21 @@ +#include +#include + +int main(int argc, char* argv[]) { + char* str = "The quick drawn fix jumps over the lazy bug"; + + // should be "The quick drawn fix jumps over the lazy bug" + char* str1 = strpbrk(str, "From The Very Beginning"); + printf("%s\n", (str1) ? str1 : "NULL"); + + // should be "lazy bug" + char* str2 = strpbrk(str, "lzbg"); + printf("%s\n", (str2) ? str2 : "NULL"); + + + // should be "NULL" + char* str3 = strpbrk(str, "404"); + printf("%s\n", (str3) ? str3 : "NULL"); + + return 0; +} From c4620be999234328e7aca7edccffdba8232071af Mon Sep 17 00:00:00 2001 From: Andrii Zymohliad Date: Mon, 12 Mar 2018 18:22:39 +0800 Subject: [PATCH 3/6] Prettify strpbrk and strstr tests --- tests/string/strpbrk.c | 15 +++++++-------- tests/string/strstr.c | 12 ++++++------ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/tests/string/strpbrk.c b/tests/string/strpbrk.c index 40cae665b1..dc0ebf7c53 100644 --- a/tests/string/strpbrk.c +++ b/tests/string/strpbrk.c @@ -2,20 +2,19 @@ #include int main(int argc, char* argv[]) { - char* str = "The quick drawn fix jumps over the lazy bug"; + char* source = "The quick drawn fix jumps over the lazy bug"; // should be "The quick drawn fix jumps over the lazy bug" - char* str1 = strpbrk(str, "From The Very Beginning"); - printf("%s\n", (str1) ? str1 : "NULL"); + char* res1 = strpbrk(source, "From The Very Beginning"); + printf("%s\n", (res1) ? res1 : "NULL"); // should be "lazy bug" - char* str2 = strpbrk(str, "lzbg"); - printf("%s\n", (str2) ? str2 : "NULL"); - + char* res2 = strpbrk(source, "lzbg"); + printf("%s\n", (res2) ? res2 : "NULL"); // should be "NULL" - char* str3 = strpbrk(str, "404"); - printf("%s\n", (str3) ? str3 : "NULL"); + char* res3 = strpbrk(source, "404"); + printf("%s\n", (res3) ? res3 : "NULL"); return 0; } diff --git a/tests/string/strstr.c b/tests/string/strstr.c index 1f6796a2f1..6a074d18d8 100644 --- a/tests/string/strstr.c +++ b/tests/string/strstr.c @@ -3,16 +3,16 @@ int main(int argc, char* argv[]) { // should be "rust" - char* str1 = strstr("In relibc we trust", "rust"); - printf("%s\n", (str1) ? str1 : "NULL"); + char* res1 = strstr("In relibc we trust", "rust"); + printf("%s\n", (res1) ? res1 : "NULL"); // should be "libc we trust" - char* str2 = strstr("In relibc we trust", "libc"); - printf("%s\n", (str2) ? str2 : "NULL"); + char* res2 = strstr("In relibc we trust", "libc"); + printf("%s\n", (res2) ? res2 : "NULL"); // should be "NULL" - char* str3 = strstr("In relibc we trust", "bugs"); - printf("%s\n", (str3) ? str3 : "NULL"); + char* res3 = strstr("In relibc we trust", "bugs"); + printf("%s\n", (res3) ? res3 : "NULL"); return 0; } From 40efea056b787f38bde154fcfe000258b58e1046 Mon Sep 17 00:00:00 2001 From: Andrii Zymohliad Date: Wed, 14 Mar 2018 08:06:51 +0800 Subject: [PATCH 4/6] Reimplement strpbrk() using strcspn() --- src/string/src/lib.rs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/string/src/lib.rs b/src/string/src/lib.rs index ef348830ee..47e562bcc2 100644 --- a/src/string/src/lib.rs +++ b/src/string/src/lib.rs @@ -251,14 +251,12 @@ pub unsafe extern "C" fn strncpy(s1: *mut c_char, s2: *const c_char, n: usize) - #[no_mangle] pub unsafe extern "C" fn strpbrk(s1: *const c_char, s2: *const c_char) -> *mut c_char { - let mut i = 0; - while *s1.offset(i) != 0 { - if !strchr(s2, *s1.offset(i) as i32).is_null() { - return s1.offset(i) as *mut c_char; - } - i += 1; + let p = s1.offset(strcspn(s1, s2) as isize); + if *p != 0 { + p as *mut c_char + } else { + ptr::null_mut() } - ptr::null_mut() } #[no_mangle] From 6d110ef0cb7845fd6869201e6a2d80bd2803951d Mon Sep 17 00:00:00 2001 From: Dan Robertson Date: Thu, 15 Mar 2018 00:46:16 +0000 Subject: [PATCH 5/6] Use a sys module for OS specific information Update cbindgen to parse modules with a path attribute and revert the following commits: - 996fad709238e5c4e24395f1c4ff8c90dfb984e5. - cfe98ab3b2ef0d211e092c846a80b969fad82f92. --- cbindgen | 2 +- src/fcntl/src/lib.rs | 52 ++--------- src/fcntl/src/linux.rs | 8 ++ src/fcntl/src/redox.rs | 20 +++++ src/signal/src/lib.rs | 186 +++------------------------------------- src/signal/src/linux.rs | 48 +++++++++++ src/signal/src/redox.rs | 44 ++++++++++ 7 files changed, 137 insertions(+), 223 deletions(-) create mode 100644 src/fcntl/src/linux.rs create mode 100644 src/fcntl/src/redox.rs create mode 100644 src/signal/src/linux.rs create mode 100644 src/signal/src/redox.rs diff --git a/cbindgen b/cbindgen index d14295f3ca..95821b3bbe 160000 --- a/cbindgen +++ b/cbindgen @@ -1 +1 @@ -Subproject commit d14295f3ca588f1d1752ea0a579f0597dd2ce248 +Subproject commit 95821b3bbe857354e3fb1efa96ed5252ecc3ec3e diff --git a/src/fcntl/src/lib.rs b/src/fcntl/src/lib.rs index 0e5048277a..0c0fa43ce2 100644 --- a/src/fcntl/src/lib.rs +++ b/src/fcntl/src/lib.rs @@ -6,55 +6,15 @@ extern crate platform; use platform::types::*; +pub use sys::*; + #[cfg(target_os = "linux")] -pub const O_RDONLY: c_int = 0x0000; -#[cfg(target_os = "linux")] -pub const O_WRONLY: c_int = 0x0001; -#[cfg(target_os = "linux")] -pub const O_RDWR: c_int = 0x0002; -#[cfg(target_os = "linux")] -pub const O_CREAT: c_int = 0x0040; -#[cfg(target_os = "linux")] -pub const O_TRUNC: c_int = 0x0200; -#[cfg(target_os = "linux")] -pub const O_ACCMODE: c_int = O_RDONLY | O_WRONLY | O_RDWR; +#[path = "linux.rs"] +pub mod sys; #[cfg(target_os = "redox")] -pub const O_RDONLY: c_int = 0x0001_0000; -#[cfg(target_os = "redox")] -pub const O_WRONLY: c_int = 0x0002_0000; -#[cfg(target_os = "redox")] -pub const O_RDWR: c_int = 0x0003_0000; -#[cfg(target_os = "redox")] -pub const O_NONBLOCK: c_int = 0x0004_0000; -#[cfg(target_os = "redox")] -pub const O_APPEND: c_int = 0x0008_0000; -#[cfg(target_os = "redox")] -pub const O_SHLOCK: c_int = 0x0010_0000; -#[cfg(target_os = "redox")] -pub const O_EXLOCK: c_int = 0x0020_0000; -#[cfg(target_os = "redox")] -pub const O_ASYNC: c_int = 0x0040_0000; -#[cfg(target_os = "redox")] -pub const O_FSYNC: c_int = 0x0080_0000; -#[cfg(target_os = "redox")] -pub const O_CLOEXEC: c_int = 0x0100_0000; -#[cfg(target_os = "redox")] -pub const O_CREAT: c_int = 0x0200_0000; -#[cfg(target_os = "redox")] -pub const O_TRUNC: c_int = 0x0400_0000; -#[cfg(target_os = "redox")] -pub const O_EXCL: c_int = 0x0800_0000; -#[cfg(target_os = "redox")] -pub const O_DIRECTORY: c_int = 0x1000_0000; -#[cfg(target_os = "redox")] -pub const O_STAT: c_int = 0x2000_0000; -#[cfg(target_os = "redox")] -pub const O_SYMLINK: c_int = 0x4000_0000; -#[cfg(target_os = "redox")] -pub const O_NOFOLLOW: c_int = 0x8000_0000; -#[cfg(target_os = "redox")] -pub const O_ACCMODE: c_int = O_RDONLY | O_WRONLY | O_RDWR; +#[path = "redox.rs"] +pub mod sys; pub const F_DUPFD: c_int = 0; pub const F_GETFD: c_int = 1; diff --git a/src/fcntl/src/linux.rs b/src/fcntl/src/linux.rs new file mode 100644 index 0000000000..fd68ffcf14 --- /dev/null +++ b/src/fcntl/src/linux.rs @@ -0,0 +1,8 @@ +use platform::types::*; + +pub const O_RDONLY: c_int = 0x0000; +pub const O_WRONLY: c_int = 0x0001; +pub const O_RDWR: c_int = 0x0002; +pub const O_CREAT: c_int = 0x0040; +pub const O_TRUNC: c_int = 0x0200; +pub const O_ACCMODE: c_int = O_RDONLY | O_WRONLY | O_RDWR; diff --git a/src/fcntl/src/redox.rs b/src/fcntl/src/redox.rs new file mode 100644 index 0000000000..1ea3ca45de --- /dev/null +++ b/src/fcntl/src/redox.rs @@ -0,0 +1,20 @@ +use platform::types::*; + +pub const O_RDONLY: c_int = 0x0001_0000; +pub const O_WRONLY: c_int = 0x0002_0000; +pub const O_RDWR: c_int = 0x0003_0000; +pub const O_NONBLOCK: c_int = 0x0004_0000; +pub const O_APPEND: c_int = 0x0008_0000; +pub const O_SHLOCK: c_int = 0x0010_0000; +pub const O_EXLOCK: c_int = 0x0020_0000; +pub const O_ASYNC: c_int = 0x0040_0000; +pub const O_FSYNC: c_int = 0x0080_0000; +pub const O_CLOEXEC: c_int = 0x0100_0000; +pub const O_CREAT: c_int = 0x0200_0000; +pub const O_TRUNC: c_int = 0x0400_0000; +pub const O_EXCL: c_int = 0x0800_0000; +pub const O_DIRECTORY: c_int = 0x1000_0000; +pub const O_STAT: c_int = 0x2000_0000; +pub const O_SYMLINK: c_int = 0x4000_0000; +pub const O_NOFOLLOW: c_int = 0x8000_0000; +pub const O_ACCMODE: c_int = O_RDONLY | O_WRONLY | O_RDWR; diff --git a/src/signal/src/lib.rs b/src/signal/src/lib.rs index 9a4e781785..80ec786e33 100644 --- a/src/signal/src/lib.rs +++ b/src/signal/src/lib.rs @@ -4,184 +4,18 @@ extern crate platform; +#[cfg(target_os = "linux")] +#[path = "linux.rs"] +pub mod sys; + +#[cfg(target_os = "redox")] +#[path = "redox.rs"] +pub mod sys; + +pub use sys::*; + use platform::types::*; -#[cfg(target_os = "linux")] -#[repr(C)] -pub struct sigset_t { - pub bits: [u64; 16], -} - -#[cfg(target_os = "linux")] -pub const SIGHUP: usize = 1; -#[cfg(target_os = "linux")] -pub const SIGINT: usize = 2; -#[cfg(target_os = "linux")] -pub const SIGQUIT: usize = 3; -#[cfg(target_os = "linux")] -pub const SIGILL: usize = 4; -#[cfg(target_os = "linux")] -pub const SIGTRAP: usize = 5; -#[cfg(target_os = "linux")] -pub const SIGABRT: usize = 6; -#[cfg(target_os = "linux")] -pub const SIGIOT: usize = SIGABRT; -#[cfg(target_os = "linux")] -pub const SIGBUS: usize = 7; -#[cfg(target_os = "linux")] -pub const SIGFPE: usize = 8; -#[cfg(target_os = "linux")] -pub const SIGKILL: usize = 9; -#[cfg(target_os = "linux")] -pub const SIGUSR1: usize = 10; -#[cfg(target_os = "linux")] -pub const SIGSEGV: usize = 11; -#[cfg(target_os = "linux")] -pub const SIGUSR2: usize = 12; -#[cfg(target_os = "linux")] -pub const SIGPIPE: usize = 13; -#[cfg(target_os = "linux")] -pub const SIGALRM: usize = 14; -#[cfg(target_os = "linux")] -pub const SIGTERM: usize = 15; -#[cfg(target_os = "linux")] -pub const SIGSTKFLT: usize = 16; -#[cfg(target_os = "linux")] -pub const SIGCHLD: usize = 17; -#[cfg(target_os = "linux")] -pub const SIGCONT: usize = 18; -#[cfg(target_os = "linux")] -pub const SIGSTOP: usize = 19; -#[cfg(target_os = "linux")] -pub const SIGTSTP: usize = 20; -#[cfg(target_os = "linux")] -pub const SIGTTIN: usize = 21; -#[cfg(target_os = "linux")] -pub const SIGTTOU: usize = 22; -#[cfg(target_os = "linux")] -pub const SIGURG: usize = 23; -#[cfg(target_os = "linux")] -pub const SIGXCPU: usize = 24; -#[cfg(target_os = "linux")] -pub const SIGXFSZ: usize = 25; -#[cfg(target_os = "linux")] -pub const SIGVTALRM: usize = 26; -#[cfg(target_os = "linux")] -pub const SIGPROF: usize = 27; -#[cfg(target_os = "linux")] -pub const SIGWINCH: usize = 28; -#[cfg(target_os = "linux")] -pub const SIGIO: usize = 29; -#[cfg(target_os = "linux")] -pub const SIGPOLL: usize = 29; -#[cfg(target_os = "linux")] -pub const SIGPWR: usize = 30; -#[cfg(target_os = "linux")] -pub const SIGSYS: usize = 31; -#[cfg(target_os = "linux")] -pub const SIGUNUSED: usize = SIGSYS; - -#[cfg(target_os = "linux")] -pub const SA_NOCLDSTOP: usize = 1; -#[cfg(target_os = "linux")] -pub const SA_NOCLDWAIT: usize = 2; -#[cfg(target_os = "linux")] -pub const SA_SIGINFO: usize = 4; -#[cfg(target_os = "linux")] -pub const SA_ONSTACK: usize = 0x08000000; -#[cfg(target_os = "linux")] -pub const SA_RESTART: usize = 0x10000000; -#[cfg(target_os = "linux")] -pub const SA_NODEFER: usize = 0x40000000; -#[cfg(target_os = "linux")] -pub const SA_RESETHAND: usize = 0x80000000; -#[cfg(target_os = "linux")] -pub const SA_RESTORER: usize = 0x04000000; - -#[cfg(target_os = "redox")] -#[repr(C)] -pub struct sigset_t { - pub bits: [u64; 2], -} - -#[cfg(target_os = "redox")] -pub const SIGHUP: usize = 1; -#[cfg(target_os = "redox")] -pub const SIGINT: usize = 2; -#[cfg(target_os = "redox")] -pub const SIGQUIT: usize = 3; -#[cfg(target_os = "redox")] -pub const SIGILL: usize = 4; -#[cfg(target_os = "redox")] -pub const SIGTRAP: usize = 5; -#[cfg(target_os = "redox")] -pub const SIGBUS: usize = 7; -#[cfg(target_os = "redox")] -pub const SIGFPE: usize = 8; -#[cfg(target_os = "redox")] -pub const SIGKILL: usize = 9; -#[cfg(target_os = "redox")] -pub const SIGUSR1: usize = 10; -#[cfg(target_os = "redox")] -pub const SIGSEGV: usize = 11; -#[cfg(target_os = "redox")] -pub const SIGUSR2: usize = 12; -#[cfg(target_os = "redox")] -pub const SIGPIPE: usize = 13; -#[cfg(target_os = "redox")] -pub const SIGALRM: usize = 14; -#[cfg(target_os = "redox")] -pub const SIGTERM: usize = 15; -#[cfg(target_os = "redox")] -pub const SIGSTKFLT: usize = 16; -#[cfg(target_os = "redox")] -pub const SIGCHLD: usize = 17; -#[cfg(target_os = "redox")] -pub const SIGCONT: usize = 18; -#[cfg(target_os = "redox")] -pub const SIGSTOP: usize = 19; -#[cfg(target_os = "redox")] -pub const SIGTSTP: usize = 20; -#[cfg(target_os = "redox")] -pub const SIGTTIN: usize = 21; -#[cfg(target_os = "redox")] -pub const SIGTTOU: usize = 22; -#[cfg(target_os = "redox")] -pub const SIGURG: usize = 23; -#[cfg(target_os = "redox")] -pub const SIGXCPU: usize = 24; -#[cfg(target_os = "redox")] -pub const SIGXFSZ: usize = 25; -#[cfg(target_os = "redox")] -pub const SIGVTALRM: usize = 26; -#[cfg(target_os = "redox")] -pub const SIGPROF: usize = 27; -#[cfg(target_os = "redox")] -pub const SIGWINCH: usize = 28; -#[cfg(target_os = "redox")] -pub const SIGIO: usize = 29; -#[cfg(target_os = "redox")] -pub const SIGPWR: usize = 30; -#[cfg(target_os = "redox")] -pub const SIGSYS: usize = 31; - -#[cfg(target_os = "redox")] -pub const SA_NOCLDSTOP: usize = 0x00000001; -#[cfg(target_os = "redox")] -pub const SA_NOCLDWAIT: usize = 0x00000002; -#[cfg(target_os = "redox")] -pub const SA_SIGINFO: usize = 0x00000004; -#[cfg(target_os = "redox")] -pub const SA_RESTORER: usize = 0x04000000; -#[cfg(target_os = "redox")] -pub const SA_ONSTACK: usize = 0x08000000; -#[cfg(target_os = "redox")] -pub const SA_RESTART: usize = 0x10000000; -#[cfg(target_os = "redox")] -pub const SA_NODEFER: usize = 0x40000000; -#[cfg(target_os = "redox")] -pub const SA_RESETHAND: usize = 0x80000000; - #[repr(C)] pub struct sigaction { pub sa_handler: extern "C" fn(usize), diff --git a/src/signal/src/linux.rs b/src/signal/src/linux.rs new file mode 100644 index 0000000000..63eff1c144 --- /dev/null +++ b/src/signal/src/linux.rs @@ -0,0 +1,48 @@ +#[repr(C)] +pub struct sigset_t { + pub bits: [u64; 16], +} + +pub const SIGHUP: usize = 1; +pub const SIGINT: usize = 2; +pub const SIGQUIT: usize = 3; +pub const SIGILL: usize = 4; +pub const SIGTRAP: usize = 5; +pub const SIGABRT: usize = 6; +pub const SIGIOT: usize = SIGABRT; +pub const SIGBUS: usize = 7; +pub const SIGFPE: usize = 8; +pub const SIGKILL: usize = 9; +pub const SIGUSR1: usize = 10; +pub const SIGSEGV: usize = 11; +pub const SIGUSR2: usize = 12; +pub const SIGPIPE: usize = 13; +pub const SIGALRM: usize = 14; +pub const SIGTERM: usize = 15; +pub const SIGSTKFLT: usize = 16; +pub const SIGCHLD: usize = 17; +pub const SIGCONT: usize = 18; +pub const SIGSTOP: usize = 19; +pub const SIGTSTP: usize = 20; +pub const SIGTTIN: usize = 21; +pub const SIGTTOU: usize = 22; +pub const SIGURG: usize = 23; +pub const SIGXCPU: usize = 24; +pub const SIGXFSZ: usize = 25; +pub const SIGVTALRM: usize = 26; +pub const SIGPROF: usize = 27; +pub const SIGWINCH: usize = 28; +pub const SIGIO: usize = 29; +pub const SIGPOLL: usize = 29; +pub const SIGPWR: usize = 30; +pub const SIGSYS: usize = 31; +pub const SIGUNUSED: usize = SIGSYS; + +pub const SA_NOCLDSTOP: usize = 1; +pub const SA_NOCLDWAIT: usize = 2; +pub const SA_SIGINFO: usize = 4; +pub const SA_ONSTACK: usize = 0x08000000; +pub const SA_RESTART: usize = 0x10000000; +pub const SA_NODEFER: usize = 0x40000000; +pub const SA_RESETHAND: usize = 0x80000000; +pub const SA_RESTORER: usize = 0x04000000; diff --git a/src/signal/src/redox.rs b/src/signal/src/redox.rs new file mode 100644 index 0000000000..54cb42adc5 --- /dev/null +++ b/src/signal/src/redox.rs @@ -0,0 +1,44 @@ +#[repr(C)] +pub struct sigset_t { + pub bits: [u64; 2], +} + +pub const SIGHUP: usize = 1; +pub const SIGINT: usize = 2; +pub const SIGQUIT: usize = 3; +pub const SIGILL: usize = 4; +pub const SIGTRAP: usize = 5; +pub const SIGBUS: usize = 7; +pub const SIGFPE: usize = 8; +pub const SIGKILL: usize = 9; +pub const SIGUSR1: usize = 10; +pub const SIGSEGV: usize = 11; +pub const SIGUSR2: usize = 12; +pub const SIGPIPE: usize = 13; +pub const SIGALRM: usize = 14; +pub const SIGTERM: usize = 15; +pub const SIGSTKFLT: usize = 16; +pub const SIGCHLD: usize = 17; +pub const SIGCONT: usize = 18; +pub const SIGSTOP: usize = 19; +pub const SIGTSTP: usize = 20; +pub const SIGTTIN: usize = 21; +pub const SIGTTOU: usize = 22; +pub const SIGURG: usize = 23; +pub const SIGXCPU: usize = 24; +pub const SIGXFSZ: usize = 25; +pub const SIGVTALRM: usize = 26; +pub const SIGPROF: usize = 27; +pub const SIGWINCH: usize = 28; +pub const SIGIO: usize = 29; +pub const SIGPWR: usize = 30; +pub const SIGSYS: usize = 31; + +pub const SA_NOCLDSTOP: usize = 0x00000001; +pub const SA_NOCLDWAIT: usize = 0x00000002; +pub const SA_SIGINFO: usize = 0x00000004; +pub const SA_RESTORER: usize = 0x04000000; +pub const SA_ONSTACK: usize = 0x08000000; +pub const SA_RESTART: usize = 0x10000000; +pub const SA_NODEFER: usize = 0x40000000; +pub const SA_RESETHAND: usize = 0x80000000; From f1d802dc1e1eb733baafd513ec8cde1c026a9ec9 Mon Sep 17 00:00:00 2001 From: Dan Robertson Date: Thu, 15 Mar 2018 01:07:44 +0000 Subject: [PATCH 6/6] signal: sigaction struct should not be a typedef The sigaction struct should not be a typedef, but the sigset_t struct should be a typedef. --- include/bits/signal.h | 10 ---------- src/signal/cbindgen.toml | 2 +- src/signal/src/lib.rs | 2 ++ src/signal/src/linux.rs | 2 +- src/signal/src/redox.rs | 2 +- src/wait/cbindgen.toml | 1 + 6 files changed, 6 insertions(+), 13 deletions(-) delete mode 100644 include/bits/signal.h diff --git a/include/bits/signal.h b/include/bits/signal.h deleted file mode 100644 index 8a6a8345d2..0000000000 --- a/include/bits/signal.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef _BITS_SIGNAL_H -#define _BITS_SIGNAL_H - -typedef struct sigaction { - void (*sa_handler)(uintptr_t); - sigset_t sa_mask; - uintptr_t sa_flags; -}; - -#endif diff --git a/src/signal/cbindgen.toml b/src/signal/cbindgen.toml index 87d334c40d..c69f579e82 100644 --- a/src/signal/cbindgen.toml +++ b/src/signal/cbindgen.toml @@ -1,6 +1,6 @@ sys_includes = ["sys/types.h"] include_guard = "_SIGNAL_H" -trailer = "#include " +style = "Tag" language = "C" [defines] diff --git a/src/signal/src/lib.rs b/src/signal/src/lib.rs index 80ec786e33..052cb13770 100644 --- a/src/signal/src/lib.rs +++ b/src/signal/src/lib.rs @@ -23,6 +23,8 @@ pub struct sigaction { pub sa_flags: usize, } +pub type sigset_t = sys_sigset_t; + #[no_mangle] pub extern "C" fn kill(pid: pid_t, sig: c_int) -> c_int { unimplemented!(); diff --git a/src/signal/src/linux.rs b/src/signal/src/linux.rs index 63eff1c144..628e813390 100644 --- a/src/signal/src/linux.rs +++ b/src/signal/src/linux.rs @@ -1,5 +1,5 @@ #[repr(C)] -pub struct sigset_t { +pub struct sys_sigset_t { pub bits: [u64; 16], } diff --git a/src/signal/src/redox.rs b/src/signal/src/redox.rs index 54cb42adc5..b5108b5a62 100644 --- a/src/signal/src/redox.rs +++ b/src/signal/src/redox.rs @@ -1,5 +1,5 @@ #[repr(C)] -pub struct sigset_t { +pub struct sys_sigset_t { pub bits: [u64; 2], } diff --git a/src/wait/cbindgen.toml b/src/wait/cbindgen.toml index 186d5f9573..528282cf3a 100644 --- a/src/wait/cbindgen.toml +++ b/src/wait/cbindgen.toml @@ -1,5 +1,6 @@ sys_includes = ["sys/types.h", "sys/resource.h"] include_guard = "_SYS_WAIT_H" +style = "Tag" language = "C" [enum]