nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-23 07:14:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use libc::accept4 on Android instead of raw syscall.

Browse Source
This commit is contained in:
Maarten de Vries 2021-02-24 12:24:36 +01:00
parent 6b56603e35
commit 3ac62cafa3
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/std/src/sys/unix/net.rs
View File

@ -195,6 +195,7 @@ impl Socket {
// glibc 2.10 and musl 0.9.5. // glibc 2.10 and musl 0.9.5.
cfg_if::cfg_if! { cfg_if::cfg_if! {
if #[cfg(any( if #[cfg(any(
target_os = "android",
target_os = "dragonfly", target_os = "dragonfly",
target_os = "freebsd", target_os = "freebsd",
target_os = "illumos", target_os = "illumos",
@ -206,13 +207,6 @@ impl Socket {
libc::accept4(self.0.raw(), storage, len, libc::SOCK_CLOEXEC) libc::accept4(self.0.raw(), storage, len, libc::SOCK_CLOEXEC)
})?; })?;
Ok(Socket(FileDesc::new(fd))) Ok(Socket(FileDesc::new(fd)))
// While the Android kernel supports the syscall,
// it is not included in all versions of Android's libc.
} else if #[cfg(target_os = "android")] {
let fd = cvt_r(|| unsafe {
libc::syscall(libc::SYS_accept4, self.0.raw(), storage, len, libc::SOCK_CLOEXEC)
})?;
Ok(Socket(FileDesc::new(fd as c_int)))
} else { } else {
let fd = cvt_r(|| unsafe { libc::accept(self.0.raw(), storage, len) })?; let fd = cvt_r(|| unsafe { libc::accept(self.0.raw(), storage, len) })?;
let fd = FileDesc::new(fd); let fd = FileDesc::new(fd);