Skip to content

refactor: cleanup bsd code #81

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
Stebalien merged 1 commit into from
Sep 21, 2025
Merged

refactor: cleanup bsd code #81

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
27 changes: 9 additions & 18 deletions src/sys/bsd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,12 @@ fn name_to_ns(name: &OsStr) -> io::Result<(c_int, CString)> {
}

fn prefix_namespace(attr: &OsStr, ns: c_int) -> OsString {
let nsname = EXTATTR_NAMESPACE_NAMES[ns as usize];
let mut v = Vec::with_capacity(nsname.as_bytes().len() + attr.as_bytes().len() + 1);
v.extend(nsname.as_bytes());
v.extend(".".as_bytes());
v.extend(attr.as_bytes());
let nsname = EXTATTR_NAMESPACE_NAMES[ns as usize].as_bytes();
let attr = attr.as_bytes();
let mut v = Vec::with_capacity(nsname.len() + attr.len() + 1);
v.extend_from_slice(nsname);
v.extend_from_slice(b".");
v.extend_from_slice(attr);
OsString::from_vec(v)
}

Expand Down Expand Up @@ -241,13 +242,7 @@ pub fn list_fd(fd: BorrowedFd<'_>) -> io::Result<XAttrs> {
};

let uservec = unsafe {
let res = allocate_loop(|ptr, len| {
extattr_list_fd(fd.as_raw_fd(), EXTATTR_NAMESPACE_USER, ptr, len)
});
match res {
Ok(v) => v,
Err(err) => return Err(err),
}
allocate_loop(|ptr, len| extattr_list_fd(fd.as_raw_fd(), EXTATTR_NAMESPACE_USER, ptr, len))?
};

Ok(XAttrs {
Expand Down Expand Up @@ -337,13 +332,9 @@ pub fn list_path(path: &Path, deref: bool) -> io::Result<XAttrs> {
};

let uservec = unsafe {
let res = allocate_loop(|ptr, len| {
allocate_loop(|ptr, len| {
extattr_list_func(path.as_ptr(), EXTATTR_NAMESPACE_USER, ptr, len)
});
match res {
Ok(v) => v,
Err(err) => return Err(err),
}
})?
};

Ok(XAttrs {
Expand Down