Skip to content

netbsd: Fix statvfs struct layout and add symbol versioning for NetBSD 10.x #5243

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

Open
fraggerfox wants to merge 3 commits into
base: main
Choose a base branch
from
+5 −4
Open

netbsd: Fix statvfs struct layout and add symbol versioning for NetBSD 10.x #5243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1436456
Fixes the NetBSD statvfs structure to NetBSD 10.0+
fraggerfox Jul 2, 2026
8efd784
Make f_spare private again.
fraggerfox Jul 3, 2026
09a7d3b
remove explicit padding.
fraggerfox Jul 4, 2026
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
6 changes: 2 additions & 4 deletions src/new/netbsd/sys/statvfs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,11 @@ s! {
pub f_namemax: c_ulong,
pub f_owner: crate::uid_t,

// This type is updated in a future version
f_spare: [u32; 4],
f_spare: [u64; 4],

pub f_fstypename: [c_char; _VFS_NAMELEN],
pub f_mntonname: [c_char; _VFS_MNAMELEN],
pub f_mntfromname: [c_char; _VFS_MNAMELEN],
// Added in NetBSD10
// pub f_mntfromlabel: [c_char; _VFS_MNAMELEN],
pub f_mntfromlabel: [c_char; _VFS_MNAMELEN],
}
}
1 change: 1 addition & 0 deletions src/unix/bsd/netbsdlike/netbsd/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2249,6 +2249,7 @@ extern "C" {
ntargets: size_t,
hint: *const c_void,
) -> c_int;
#[link_name = "__getmntinfo90"]
pub fn getmntinfo(mntbufp: *mut *mut crate::statvfs, flags: c_int) -> c_int;
pub fn getvfsstat(buf: *mut crate::statvfs, bufsize: size_t, flags: c_int) -> c_int;

Expand Down
2 changes: 2 additions & 0 deletions src/unix/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1619,8 +1619,10 @@ extern "C" {
pub fn sem_trywait(sem: *mut sem_t) -> c_int;
pub fn sem_post(sem: *mut sem_t) -> c_int;
#[cfg_attr(gnu_file_offset_bits64, link_name = "statvfs64")]
#[cfg_attr(target_os = "netbsd", link_name = "__statvfs190")]
pub fn statvfs(path: *const c_char, buf: *mut crate::statvfs) -> c_int;
#[cfg_attr(gnu_file_offset_bits64, link_name = "fstatvfs64")]
#[cfg_attr(target_os = "netbsd", link_name = "__fstatvfs190")]
pub fn fstatvfs(fd: c_int, buf: *mut crate::statvfs) -> c_int;

#[cfg_attr(target_os = "netbsd", link_name = "__sigemptyset14")]
Expand Down