squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

ext/ucred: fmt check

Browse source
This commit is contained in:
William Woodruff 2020-11-24 14:55:35 -05:00
parent fe0bea2cc1
commit 3d8329f6fc
No known key found for this signature in database
GPG key ID: 600D68320BE45ACC
2 changed files with 8 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
library/std/src/sys/unix/ext/ucred.rs
View file

@ -28,17 +28,10 @@ pub struct UCred {
#[cfg(any(target_os = "android", target_os = "linux"))]
pub use self::impl_linux::peer_cred;
#[cfg(any(
target_os = "dragonfly",
target_os = "freebsd",
target_os = "openbsd"
))]
#[cfg(any(target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd"))]
pub use self::impl_bsd::peer_cred;
#[cfg(any(
target_os = "macos",
target_os = "ios",
))]
#[cfg(any(target_os = "macos", target_os = "ios",))]
pub use self::impl_mac::peer_cred;
#[cfg(any(target_os = "linux", target_os = "android"))]
@ -77,11 +70,7 @@ pub mod impl_linux {
}
}
#[cfg(any(
target_os = "dragonfly",
target_os = "freebsd",
target_os = "openbsd"
))]
#[cfg(any(target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd"))]
pub mod impl_bsd {
use super::UCred;
use crate::io;
@ -98,16 +87,13 @@ pub mod impl_bsd {
}
}
#[cfg(any(
target_os = "macos",
target_os = "ios",
))]
#[cfg(any(target_os = "macos", target_os = "ios",))]
pub mod impl_mac {
use super::UCred;
use crate::{io, mem};
use crate::os::unix::io::AsRawFd;
use crate::os::unix::net::UnixStream;
use libc::{c_void, getpeereid, getsockopt, pid_t, socklen_t, SOL_LOCAL, LOCAL_PEERPID};
use crate::{io, mem};
use libc::{c_void, getpeereid, getsockopt, pid_t, socklen_t, LOCAL_PEERPID, SOL_LOCAL};
pub fn peer_cred(socket: &UnixStream) -> io::Result<UCred> {
let mut cred = UCred { uid: 1, gid: 1, pid: None };
@ -126,7 +112,7 @@ pub mod impl_mac {
SOL_LOCAL,
LOCAL_PEERPID,
&mut pid as *mut pid_t as *mut c_void,
&mut pid_size
&mut pid_size,
);
if ret == 0 && pid_size as usize == mem::size_of::<pid_t>() {

6
library/std/src/sys/unix/ext/ucred/tests.rs
View file

@ -25,11 +25,7 @@ fn test_socket_pair() {
}
#[test]
#[cfg(any(
target_os = "linux",
target_os = "ios",
target_os = "macos",
))]
#[cfg(any(target_os = "linux", target_os = "ios", target_os = "macos",))]
fn test_socket_pair_pids(arg: Type) -> RetType {
// Create two connected sockets and get their peer credentials.
let (sock_a, sock_b) = UnixStream::pair().unwrap();