summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-02-14 08:06:46 +0000
committerbors <bors@rust-lang.org>2023-02-14 08:06:46 +0000
commite401a59dd35171983545072eb296b1b1ced1b8c1 (patch)
tree6f050a9c25f8ab8adedf72b49f55c8a632c131f5
parent78d774fbc1c256d6cfae8ea71082b4dc68724634 (diff)
parent3a19eca48ec4c26430c0ba48da897d5ade98dc8d (diff)
downloadrust-libc-e401a59dd35171983545072eb296b1b1ced1b8c1.tar.gz
Auto merge of #3104 - devnexen:linux_addstrchrnul, r=JohnTitor
linux adding strchrnul
-rw-r--r--libc-test/semver/android.txt1
-rw-r--r--libc-test/semver/linux.txt1
-rw-r--r--src/unix/linux_like/mod.rs2
3 files changed, 4 insertions, 0 deletions
diff --git a/libc-test/semver/android.txt b/libc-test/semver/android.txt
index 72f90c8a3c..3bee01ca18 100644
--- a/libc-test/semver/android.txt
+++ b/libc-test/semver/android.txt
@@ -3498,6 +3498,7 @@ strcasecmp
strcasestr
strcat
strchr
+strchrnul
strcmp
strcoll
strcpy
diff --git a/libc-test/semver/linux.txt b/libc-test/semver/linux.txt
index 320f5ae307..daccc3c38d 100644
--- a/libc-test/semver/linux.txt
+++ b/libc-test/semver/linux.txt
@@ -3383,6 +3383,7 @@ statfs64
statvfs64
strcasecmp
strcasestr
+strchrnul
strncasecmp
strndup
strsignal
diff --git a/src/unix/linux_like/mod.rs b/src/unix/linux_like/mod.rs
index a7e8634ad6..20d0006bd4 100644
--- a/src/unix/linux_like/mod.rs
+++ b/src/unix/linux_like/mod.rs
@@ -1784,6 +1784,8 @@ extern "C" {
pub fn sendmsg(fd: ::c_int, msg: *const ::msghdr, flags: ::c_int) -> ::ssize_t;
pub fn recvmsg(fd: ::c_int, msg: *mut ::msghdr, flags: ::c_int) -> ::ssize_t;
pub fn uname(buf: *mut ::utsname) -> ::c_int;
+
+ pub fn strchrnul(s: *const ::c_char, c: ::c_int) -> *mut ::c_char;
}
cfg_if! {