mtrossevin/storefd
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

listen: Make one of the closure into a function

Browse source 
This make it a bit easier to debug any problems with it.
This commit is contained in:
Mathieu Trossevin 2024-01-09 10:35:48 +01:00
parent 907008df66
commit f61df0da1b
Signed by: mtrossevin
GPG key ID: D1DBB7EA828374E9
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/listen/mod.rs
View file

@ -236,6 +236,18 @@ impl FileDescriptor {
.collect::<Vec<_>>())
}
fn from_fd_offset(fd_offset: usize) -> Result<Self, DupError> {
SD_LISTEN_FDS_START
.checked_add(fd_offset as RawFd)
.map(|fd| {
// SAFETY: The file descriptor won't be closed by the time we duplicate it.
let fd = unsafe { BorrowedFd::borrow_raw(fd) };
rustix::fs::fcntl_dupfd_cloexec(fd, 0).map_err(DupError::from)
})
.expect("Already checked against overflow.")
.map(Self::from_fd)
}
fn from_fds(
num_fds: usize,
) -> Result<impl IntoIterator<Item = Result<Self, DupError>>, GetFdsError> {
@ -243,17 +255,7 @@ impl FileDescriptor {
return Err(GetFdsError::TooManyFDs(num_fds));
}
let ret = (0..num_fds).map(|fd_offset| {
SD_LISTEN_FDS_START
.checked_add(fd_offset as RawFd)
.map(|fd| {
// SAFETY: The file descriptor won't be closed by the time we duplicate it.
let fd = unsafe { BorrowedFd::borrow_raw(fd) };
rustix::fs::fcntl_dupfd_cloexec(fd, 0).map_err(DupError::from)
})
.expect("Already checked against overflow.")
.map(Self::from_fd)
});
let ret = (0..num_fds).map(Self::from_fd_offset);
Ok(ret)
}