summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-03-27 20:30:48 +0000
committerbors <bors@rust-lang.org>2023-03-27 20:30:48 +0000
commit7b5a0b7a3846848075f161b277b2258e54cdfc4e (patch)
tree53a973bda1d87ea7714b29770f2fe60e3a14fa61
parent9ac18cda748ae45811331d537cf7b375ec91089d (diff)
parentec2ea5edb7251d50ef974ff4f406aa0fc52f5c1f (diff)
downloadrust-libc-7b5a0b7a3846848075f161b277b2258e54cdfc4e.tar.gz
Auto merge of #3168 - devnexen:redox_strclpy_api, r=JohnTitor
redox add strlcpy api
-rw-r--r--libc-test/semver/redox.txt2
-rw-r--r--src/unix/redox/mod.rs4
2 files changed, 6 insertions, 0 deletions
diff --git a/libc-test/semver/redox.txt b/libc-test/semver/redox.txt
index 4169bb79a2..139f78c07b 100644
--- a/libc-test/semver/redox.txt
+++ b/libc-test/semver/redox.txt
@@ -207,6 +207,8 @@ setrlimit
setservent
strcasecmp
strcasestr
+strlcat
+strlcpy
strncasecmp
strndup
strsignal
diff --git a/src/unix/redox/mod.rs b/src/unix/redox/mod.rs
index cb4512d8bc..278ce7c350 100644
--- a/src/unix/redox/mod.rs
+++ b/src/unix/redox/mod.rs
@@ -1043,6 +1043,10 @@ extern "C" {
pub fn pthread_cancel(thread: ::pthread_t) -> ::c_int;
pub fn pthread_kill(thread: ::pthread_t, sig: ::c_int) -> ::c_int;
+ // string.h
+ pub fn strlcat(dst: *mut ::c_char, src: *const ::c_char, siz: ::size_t) -> ::size_t;
+ pub fn strlcpy(dst: *mut ::c_char, src: *const ::c_char, siz: ::size_t) -> ::size_t;
+
// sys/epoll.h
pub fn epoll_create(size: ::c_int) -> ::c_int;
pub fn epoll_create1(flags: ::c_int) -> ::c_int;