summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-11-05 03:43:31 +0000
committerbors <bors@rust-lang.org>2021-11-05 03:43:31 +0000
commit59e0b57a5c331a0adba11b4257ebe87230c02f59 (patch)
tree0e874e13e1d929a24a8a2482a0545ca1d98c799d
parent4634afdb37530110bad196a7b916bcbda9df8c21 (diff)
parent6ff2d74cfb6b30a2c5659ce24d5d7039dffc6a9e (diff)
downloadrust-libc-59e0b57a5c331a0adba11b4257ebe87230c02f59.tar.gz
Auto merge of #2512 - devnexen:netbsd_eapi_upd, r=Amanieu
netbsd libutil update
-rw-r--r--libc-test/semver/netbsd.txt3
-rw-r--r--src/unix/bsd/netbsdlike/netbsd/mod.rs13
2 files changed, 16 insertions, 0 deletions
diff --git a/libc-test/semver/netbsd.txt b/libc-test/semver/netbsd.txt
index a71097f83c..b58ddd4e06 100644
--- a/libc-test/semver/netbsd.txt
+++ b/libc-test/semver/netbsd.txt
@@ -1134,11 +1134,14 @@ easprintf
efopen
emalloc
erealloc
+ereallocarr
esetfunc
estrdup
estrndup
estrlcat
estrlcpy
+estrtoi
+estrtou
evasprintf
endgrent
endpwent
diff --git a/src/unix/bsd/netbsdlike/netbsd/mod.rs b/src/unix/bsd/netbsdlike/netbsd/mod.rs
index c511fadccc..678402f4a8 100644
--- a/src/unix/bsd/netbsdlike/netbsd/mod.rs
+++ b/src/unix/bsd/netbsdlike/netbsd/mod.rs
@@ -2536,10 +2536,23 @@ extern "C" {
pub fn emalloc(n: ::size_t) -> *mut ::c_void;
pub fn ecalloc(n: ::size_t, c: ::size_t) -> *mut ::c_void;
pub fn erealloc(p: *mut ::c_void, n: ::size_t) -> *mut ::c_void;
+ pub fn ereallocarr(p: *mut ::c_void, n: ::size_t, s: ::size_t);
pub fn estrdup(s: *const ::c_char) -> *mut ::c_char;
pub fn estrndup(s: *const ::c_char, len: ::size_t) -> *mut ::c_char;
pub fn estrlcpy(dst: *mut ::c_char, src: *const ::c_char, len: ::size_t) -> ::size_t;
pub fn estrlcat(dst: *mut ::c_char, src: *const ::c_char, len: ::size_t) -> ::size_t;
+ pub fn estrtoi(
+ nptr: *const ::c_char,
+ base: ::c_int,
+ lo: ::intmax_t,
+ hi: ::intmax_t,
+ ) -> ::intmax_t;
+ pub fn estrtou(
+ nptr: *const ::c_char,
+ base: ::c_int,
+ lo: ::uintmax_t,
+ hi: ::uintmax_t,
+ ) -> ::uintmax_t;
pub fn easprintf(string: *mut *mut ::c_char, fmt: *const ::c_char, ...) -> ::c_int;
pub fn evasprintf(string: *mut *mut ::c_char, fmt: *const ::c_char, ...) -> ::c_int;
pub fn esetfunc(