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

bors · bors · commit b5a6e4b91907 · 2021-11-13T15:02:23.000Z
linux/android ctermid addition. close #1928
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/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! {

Original file line number	Diff line number	Diff line change
`@@ -1274,6 +1274,8 @@ extern "C" {`
`1274`	`1274`	`pub fn explicit_bzero(s: *mut ::c_void, len: ::size_t);`
`1275`	`1275`	// Added in `glibc` 2.29
`1276`	`1276`	`pub fn reallocarray(ptr: mut ::c_void, nmemb: ::size_t, size: ::size_t) -> mut ::c_void;`
	`1277`	`+`
	`1278`	`+ pub fn ctermid(s: mut ::c_char) -> mut ::c_char;`
`1277`	`1279`	`}`
`1278`	`1280`
`1279`	`1281`	`extern "C" {`
Original file line number	Diff line number	Diff line change
`@@ -758,6 +758,8 @@ extern "C" {`
`758`	`758`
`759`	`759`	`pub fn adjtimex(buf: *mut ::timex) -> ::c_int;`
`760`	`760`	`pub fn clock_adjtime(clk_id: ::clockid_t, buf: *mut ::timex) -> ::c_int;`
	`761`	`+`
	`762`	`+ pub fn ctermid(s: mut ::c_char) -> mut ::c_char;`
`761`	`763`	`}`
`762`	`764`
`763`	`765`	`cfg_if! {`