Skip to content

Change listxattr's list argument to [u8]. #1303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sunfishcode merged 1 commit into from
Jan 31, 2025
Merged

Change listxattr's list argument to [u8]. #1303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 26 additions & 9 deletions src/backend/libc/fs/syscalls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2441,53 +2441,70 @@ pub(crate) fn fsetxattr(
}

#[cfg(any(apple, linux_kernel, target_os = "hurd"))]
pub(crate) fn listxattr(path: &CStr, list: &mut [ffi::c_char]) -> io::Result<usize> {
pub(crate) fn listxattr(path: &CStr, list: &mut [u8]) -> io::Result<usize> {
#[cfg(not(apple))]
unsafe {
ret_usize(c::listxattr(path.as_ptr(), list.as_mut_ptr(), list.len()))
ret_usize(c::listxattr(
path.as_ptr(),
list.as_mut_ptr().cast::<ffi::c_char>(),
list.len(),
))
}

#[cfg(apple)]
unsafe {
ret_usize(c::listxattr(
path.as_ptr(),
list.as_mut_ptr(),
list.as_mut_ptr().cast::<ffi::c_char>(),
list.len(),
0,
))
}
}

#[cfg(any(apple, linux_kernel, target_os = "hurd"))]
pub(crate) fn llistxattr(path: &CStr, list: &mut [ffi::c_char]) -> io::Result<usize> {
pub(crate) fn llistxattr(path: &CStr, list: &mut [u8]) -> io::Result<usize> {
#[cfg(not(apple))]
unsafe {
ret_usize(c::llistxattr(path.as_ptr(), list.as_mut_ptr(), list.len()))
ret_usize(c::llistxattr(
path.as_ptr(),
list.as_mut_ptr().cast::<ffi::c_char>(),
list.len(),
))
}

#[cfg(apple)]
unsafe {
ret_usize(c::listxattr(
path.as_ptr(),
list.as_mut_ptr(),
list.as_mut_ptr().cast::<ffi::c_char>(),
list.len(),
c::XATTR_NOFOLLOW,
))
}
}

#[cfg(any(apple, linux_kernel, target_os = "hurd"))]
pub(crate) fn flistxattr(fd: BorrowedFd<'_>, list: &mut [ffi::c_char]) -> io::Result<usize> {
pub(crate) fn flistxattr(fd: BorrowedFd<'_>, list: &mut [u8]) -> io::Result<usize> {
let fd = borrowed_fd(fd);

#[cfg(not(apple))]
unsafe {
ret_usize(c::flistxattr(fd, list.as_mut_ptr(), list.len()))
ret_usize(c::flistxattr(
fd,
list.as_mut_ptr().cast::<ffi::c_char>(),
list.len(),
))
}

#[cfg(apple)]
unsafe {
ret_usize(c::flistxattr(fd, list.as_mut_ptr(), list.len(), 0))
ret_usize(c::flistxattr(
fd,
list.as_mut_ptr().cast::<ffi::c_char>(),
list.len(),
0,
))
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/backend/linux_raw/fs/syscalls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ use crate::backend::conv::{loff_t, loff_t_from_u64, ret_u64};
))]
use crate::fd::AsFd;
use crate::fd::{BorrowedFd, OwnedFd};
use crate::ffi::{self, CStr};
use crate::ffi::CStr;
#[cfg(any(target_arch = "aarch64", target_arch = "riscv64"))]
use crate::fs::CWD;
use crate::fs::{
Expand Down Expand Up @@ -1628,19 +1628,19 @@ pub(crate) fn fsetxattr(
}

#[inline]
pub(crate) fn listxattr(path: &CStr, list: &mut [ffi::c_char]) -> io::Result<usize> {
pub(crate) fn listxattr(path: &CStr, list: &mut [u8]) -> io::Result<usize> {
let (list_addr_mut, list_len) = slice_mut(list);
unsafe { ret_usize(syscall!(__NR_listxattr, path, list_addr_mut, list_len)) }
}

#[inline]
pub(crate) fn llistxattr(path: &CStr, list: &mut [ffi::c_char]) -> io::Result<usize> {
pub(crate) fn llistxattr(path: &CStr, list: &mut [u8]) -> io::Result<usize> {
let (list_addr_mut, list_len) = slice_mut(list);
unsafe { ret_usize(syscall!(__NR_llistxattr, path, list_addr_mut, list_len)) }
}

#[inline]
pub(crate) fn flistxattr(fd: BorrowedFd<'_>, list: &mut [ffi::c_char]) -> io::Result<usize> {
pub(crate) fn flistxattr(fd: BorrowedFd<'_>, list: &mut [u8]) -> io::Result<usize> {
let (list_addr_mut, list_len) = slice_mut(list);
unsafe { ret_usize(syscall!(__NR_flistxattr, fd, list_addr_mut, list_len)) }
}
Expand Down
6 changes: 3 additions & 3 deletions src/fs/xattr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ pub fn fsetxattr<Fd: AsFd, Name: path::Arg>(
///
/// [Linux]: https://man7.org/linux/man-pages/man2/listxattr.2.html
#[inline]
pub fn listxattr<P: path::Arg>(path: P, list: &mut [ffi::c_char]) -> io::Result<usize> {
pub fn listxattr<P: path::Arg>(path: P, list: &mut [u8]) -> io::Result<usize> {
path.into_with_c_str(|path| backend::fs::syscalls::listxattr(path, list))
}

Expand All @@ -149,7 +149,7 @@ pub fn listxattr<P: path::Arg>(path: P, list: &mut [ffi::c_char]) -> io::Result<
///
/// [Linux]: https://man7.org/linux/man-pages/man2/llistxattr.2.html
#[inline]
pub fn llistxattr<P: path::Arg>(path: P, list: &mut [ffi::c_char]) -> io::Result<usize> {
pub fn llistxattr<P: path::Arg>(path: P, list: &mut [u8]) -> io::Result<usize> {
path.into_with_c_str(|path| backend::fs::syscalls::llistxattr(path, list))
}

Expand All @@ -161,7 +161,7 @@ pub fn llistxattr<P: path::Arg>(path: P, list: &mut [ffi::c_char]) -> io::Result
///
/// [Linux]: https://man7.org/linux/man-pages/man2/flistxattr.2.html
#[inline]
pub fn flistxattr<Fd: AsFd>(fd: Fd, list: &mut [ffi::c_char]) -> io::Result<usize> {
pub fn flistxattr<Fd: AsFd>(fd: Fd, list: &mut [u8]) -> io::Result<usize> {
backend::fs::syscalls::flistxattr(fd.as_fd(), list)
}

Expand Down