Auto merge of #2532 - devnexen:linux_ctermid, r=Amanieu

linux/android ctermid addition. close #1928
rust-lang · Nov 13, 2021 · ed16cb0 · ed16cb0
2 parents 8c6b634 + 710e4c7
commit ed16cb0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 0 deletions.
diff --git a/libc-test/semver/linux-gnu.txt b/libc-test/semver/linux-gnu.txt
@@ -567,6 +567,7 @@ aiocb
 backtrace
 clock_adjtime
 copy_file_range
+ctermid
 dlinfo
 dlmopen
 endutxent

diff --git a/libc-test/semver/linux-musl.txt b/libc-test/semver/linux-musl.txt
@@ -25,6 +25,7 @@ aio_suspend
 aio_write
 aiocb
 clock_adjtime
+ctermid
 explicit_bzero
 futimes
 getauxval

diff --git a/src/unix/linux_like/android/mod.rs b/src/unix/linux_like/android/mod.rs
@@ -2977,6 +2977,8 @@ extern "C" {
     pub fn reallocarray(ptr: *mut ::c_void, nmemb: ::size_t, size: ::size_t) -> *mut ::c_void;
 
     pub fn pthread_getcpuclockid(thread: ::pthread_t, clk_id: *mut ::clockid_t) -> ::c_int;
+
+    pub fn ctermid(s: *mut ::c_char) -> *mut ::c_char;
 }
 
 cfg_if! {

diff --git a/src/unix/linux_like/linux/gnu/mod.rs b/src/unix/linux_like/linux/gnu/mod.rs
@@ -1274,6 +1274,8 @@ extern "C" {
     pub fn explicit_bzero(s: *mut ::c_void, len: ::size_t);
     // Added in `glibc` 2.29
     pub fn reallocarray(ptr: *mut ::c_void, nmemb: ::size_t, size: ::size_t) -> *mut ::c_void;
+
+    pub fn ctermid(s: *mut ::c_char) -> *mut ::c_char;
 }
 
 extern "C" {

diff --git a/src/unix/linux_like/linux/musl/mod.rs b/src/unix/linux_like/linux/musl/mod.rs
@@ -758,6 +758,8 @@ extern "C" {
 
     pub fn adjtimex(buf: *mut ::timex) -> ::c_int;
     pub fn clock_adjtime(clk_id: ::clockid_t, buf: *mut ::timex) -> ::c_int;
+
+    pub fn ctermid(s: *mut ::c_char) -> *mut ::c_char;
 }
 
 cfg_if! {