NetBSD: Introduce statvfs.rs

Move statvfs types to the `new` module.

Link: https://github.com/NetBSD/src/blob/6ace5fed3bd010695a1b88ca6c1f8a5af7793ffb/sys/sys/statvfs.h#L66-L101

(backport <#4782>)
(cherry picked from commit c4731a0)

Author: tgross35

src/new/mod.rs

@@ -182,6 +182,8 @@ cfg_if! {
         pub use net::route::*;
     } else if #[cfg(target_vendor = "apple")] {
         pub use signal::*;
+    } else if #[cfg(target_os = "netbsd")] {
+        pub use sys::statvfs::*;
     }
 }
 

src/new/netbsd/mod.rs

@@ -1,5 +1,8 @@
 //! NetBSD libc.
 //!
+//! * Headers: <https://github.com/NetBSD/src/tree/trunk/include>
+//! * Sys headers: <https://github.com/NetBSD/src/tree/trunk/sys/sys>
 //! * Manual pages: <https://man.netbsd.org/>
 
+pub(crate) mod sys;
 pub(crate) mod unistd;

src/new/netbsd/sys/mod.rs

@@ -0,0 +1,5 @@
+//! Directory: `sys/`
+//!
+//! https://github.com/NetBSD/src/tree/trunk/sys/sys
+
+pub(crate) mod statvfs;

src/new/netbsd/sys/statvfs.rs

@@ -0,0 +1,44 @@
+//! Header: `sys/statvfs.h`
+//!
+//! <https://github.com/NetBSD/src/blob/trunk/sys/sys/statvfs.h>
+
+use crate::prelude::*;
+
+const _VFS_NAMELEN: usize = 32;
+const _VFS_MNAMELEN: usize = 1024;
+
+s! {
+    pub struct statvfs {
+        pub f_flag: c_ulong,
+        pub f_bsize: c_ulong,
+        pub f_frsize: c_ulong,
+        pub f_iosize: c_ulong,
+
+        pub f_blocks: crate::fsblkcnt_t,
+        pub f_bfree: crate::fsblkcnt_t,
+        pub f_bavail: crate::fsblkcnt_t,
+        pub f_bresvd: crate::fsblkcnt_t,
+
+        pub f_files: crate::fsfilcnt_t,
+        pub f_ffree: crate::fsfilcnt_t,
+        pub f_favail: crate::fsfilcnt_t,
+        pub f_fresvd: crate::fsfilcnt_t,
+
+        pub f_syncreads: u64,
+        pub f_syncwrites: u64,
+
+        pub f_asyncreads: u64,
+        pub f_asyncwrites: u64,
+
+        pub f_fsidx: crate::fsid_t,
+        pub f_fsid: c_ulong,
+        pub f_namemax: c_ulong,
+        pub f_owner: crate::uid_t,
+
+        pub f_spare: [u32; 4],
+
+        pub f_fstypename: [c_char; _VFS_NAMELEN],
+        pub f_mntonname: [c_char; _VFS_MNAMELEN],
+        pub f_mntfromname: [c_char; _VFS_MNAMELEN],
+    }
+}

src/unix/bsd/netbsdlike/netbsd/mod.rs

@@ -852,40 +852,6 @@ s! {
         pub d_name: [c_char; 512],
     }
 
-    pub struct statvfs {
-        pub f_flag: c_ulong,
-        pub f_bsize: c_ulong,
-        pub f_frsize: c_ulong,
-        pub f_iosize: c_ulong,
-
-        pub f_blocks: crate::fsblkcnt_t,
-        pub f_bfree: crate::fsblkcnt_t,
-        pub f_bavail: crate::fsblkcnt_t,
-        pub f_bresvd: crate::fsblkcnt_t,
-
-        pub f_files: crate::fsfilcnt_t,
-        pub f_ffree: crate::fsfilcnt_t,
-        pub f_favail: crate::fsfilcnt_t,
-        pub f_fresvd: crate::fsfilcnt_t,
-
-        pub f_syncreads: u64,
-        pub f_syncwrites: u64,
-
-        pub f_asyncreads: u64,
-        pub f_asyncwrites: u64,
-
-        pub f_fsidx: crate::fsid_t,
-        pub f_fsid: c_ulong,
-        pub f_namemax: c_ulong,
-        pub f_owner: crate::uid_t,
-
-        pub f_spare: [u32; 4],
-
-        pub f_fstypename: [c_char; 32],
-        pub f_mntonname: [c_char; 1024],
-        pub f_mntfromname: [c_char; 1024],
-    }
-
     pub struct sockaddr_storage {
         pub ss_len: u8,
         pub ss_family: crate::sa_family_t,
@@ -2460,7 +2426,7 @@ extern "C" {
     ) -> c_int;
     #[link_name = "__getmntinfo13"]
     pub fn getmntinfo(mntbufp: *mut *mut crate::statvfs, flags: c_int) -> c_int;
-    pub fn getvfsstat(buf: *mut statvfs, bufsize: size_t, flags: c_int) -> c_int;
+    pub fn getvfsstat(buf: *mut crate::statvfs, bufsize: size_t, flags: c_int) -> c_int;
 
     // Added in `NetBSD` 10.0
     pub fn timerfd_create(clockid: crate::clockid_t, flags: c_int) -> c_int;

src/unix/mod.rs

@@ -1543,9 +1543,9 @@ 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")]
-    pub fn statvfs(path: *const c_char, buf: *mut statvfs) -> c_int;
+    pub fn statvfs(path: *const c_char, buf: *mut crate::statvfs) -> c_int;
     #[cfg_attr(gnu_file_offset_bits64, link_name = "fstatvfs64")]
-    pub fn fstatvfs(fd: c_int, buf: *mut statvfs) -> c_int;
+    pub fn fstatvfs(fd: c_int, buf: *mut crate::statvfs) -> c_int;
 
     #[cfg_attr(target_os = "netbsd", link_name = "__sigemptyset14")]
     pub fn sigemptyset(set: *mut sigset_t) -> c_int;