Skip to content
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

Support NetBSD 10+ version of struct statvfs #4277

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Support NetBSD 10+ version of struct statvfs #4277

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
13 changes: 11 additions & 2 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 @@ -877,11 +877,12 @@ s_no_extra_traits! {
pub f_namemax: c_ulong,
pub f_owner: crate::uid_t,

pub f_spare: [u32; 4],
pub f_spare: [u64; 4],

pub f_fstypename: [c_char; 32],
pub f_mntonname: [c_char; 1024],
pub f_mntfromname: [c_char; 1024],
pub f_mntfromlabel: [c_char; 1024],
}

pub struct sockaddr_storage {
Expand Down Expand Up @@ -1207,6 +1208,11 @@ cfg_if! {
.iter()
.zip(other.f_mntfromname.iter())
.all(|(a, b)| a == b)
&& self
.f_mntfromlabel
.iter()
.zip(other.f_mntfromlabel.iter())
.all(|(a, b)| a == b)
}
}
impl Eq for statvfs {}
Expand Down Expand Up @@ -1237,6 +1243,7 @@ cfg_if! {
.field("f_fstypename", &self.f_fstypename)
// FIXME: .field("f_mntonname", &self.f_mntonname)
// FIXME: .field("f_mntfromname", &self.f_mntfromname)
// FIXME: .field("f_mntfromlabel", &self.f_mntfromlabel)
.finish()
}
}
Expand Down Expand Up @@ -1266,6 +1273,7 @@ cfg_if! {
self.f_fstypename.hash(state);
self.f_mntonname.hash(state);
self.f_mntfromname.hash(state);
self.f_mntfromlabel.hash(state);
}
}

Expand Down Expand Up @@ -2849,8 +2857,9 @@ extern "C" {
ntargets: size_t,
hint: *const c_void,
) -> c_int;
#[link_name = "__getmntinfo13"]
#[link_name = "__getmntinfo90"]
pub fn getmntinfo(mntbufp: *mut *mut crate::statvfs, flags: c_int) -> c_int;
#[link_name = "__getvfsstat90"]
pub fn getvfsstat(buf: *mut 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 @@ -1420,7 +1420,9 @@ extern "C" {
pub fn sem_wait(sem: *mut sem_t) -> c_int;
pub fn sem_trywait(sem: *mut sem_t) -> c_int;
pub fn sem_post(sem: *mut sem_t) -> c_int;
#[cfg_attr(target_os = "netbsd", link_name = "__statvfs90")]
pub fn statvfs(path: *const c_char, buf: *mut statvfs) -> c_int;
#[cfg_attr(target_os = "netbsd", link_name = "__fstatvfs90")]
pub fn fstatvfs(fd: c_int, buf: *mut statvfs) -> c_int;

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