linux_like: Unify statx definitions

The statx system call and corresponding constants are defined by the
Linux kernel and don't depend on the libc or architecture. The only
difference is whether a libc exports the statx syscall wrapper or not.

We can thus unify the statx definitions for all Linux "like" platforms:
GNU (glibc), Android (bionic), and (in a later commit) musl.

Author: neuschaefer

src/unix/linux_like/android/mod.rs

@@ -515,39 +515,6 @@ s! {
        pub ifr6_prefixlen: u32,
        pub ifr6_ifindex: ::c_int,
     }
-
-    pub struct statx {
-        pub stx_mask: ::__u32,
-        pub stx_blksize: ::__u32,
-        pub stx_attributes: ::__u64,
-        pub stx_nlink: ::__u32,
-        pub stx_uid: ::__u32,
-        pub stx_gid: ::__u32,
-        pub stx_mode: ::__u16,
-        __statx_pad1: [::__u16; 1],
-        pub stx_ino: ::__u64,
-        pub stx_size: ::__u64,
-        pub stx_blocks: ::__u64,
-        pub stx_attributes_mask: ::__u64,
-        pub stx_atime: ::statx_timestamp,
-        pub stx_btime: ::statx_timestamp,
-        pub stx_ctime: ::statx_timestamp,
-        pub stx_mtime: ::statx_timestamp,
-        pub stx_rdev_major: ::__u32,
-        pub stx_rdev_minor: ::__u32,
-        pub stx_dev_major: ::__u32,
-        pub stx_dev_minor: ::__u32,
-        pub stx_mnt_id: ::__u64,
-        pub stx_dio_mem_align: ::__u32,
-        pub stx_dio_offset_align: ::__u32,
-        __statx_pad3: [::__u64; 12],
-    }
-
-    pub struct statx_timestamp {
-        pub tv_sec: ::__s64,
-        pub tv_nsec: ::__u32,
-        pub __reserved: ::__s32,
-    }
 }
 
 s_no_extra_traits! {
@@ -4158,13 +4125,6 @@ extern "C" {
         newpath: *const ::c_char,
         flags: ::c_uint,
     ) -> ::c_int;
-    pub fn statx(
-        dirfd: ::c_int,
-        pathname: *const c_char,
-        flags: ::c_int,
-        mask: ::c_uint,
-        statxbuf: *mut statx,
-    ) -> ::c_int;
 
     pub fn klogctl(syslog_type: ::c_int, bufp: *mut ::c_char, len: ::c_int) -> ::c_int;
 }

src/unix/linux_like/linux/gnu/mod.rs

@@ -16,39 +16,6 @@ cfg_if! {
 }
 
 s! {
-    pub struct statx {
-        pub stx_mask: u32,
-        pub stx_blksize: u32,
-        pub stx_attributes: u64,
-        pub stx_nlink: u32,
-        pub stx_uid: u32,
-        pub stx_gid: u32,
-        pub stx_mode: u16,
-        __statx_pad1: [u16; 1],
-        pub stx_ino: u64,
-        pub stx_size: u64,
-        pub stx_blocks: u64,
-        pub stx_attributes_mask: u64,
-        pub stx_atime: ::statx_timestamp,
-        pub stx_btime: ::statx_timestamp,
-        pub stx_ctime: ::statx_timestamp,
-        pub stx_mtime: ::statx_timestamp,
-        pub stx_rdev_major: u32,
-        pub stx_rdev_minor: u32,
-        pub stx_dev_major: u32,
-        pub stx_dev_minor: u32,
-        pub stx_mnt_id: u64,
-        pub stx_dio_mem_align: u32,
-        pub stx_dio_offset_align: u32,
-        __statx_pad3: [u64; 12],
-    }
-
-    pub struct statx_timestamp {
-        pub tv_sec: i64,
-        pub tv_nsec: u32,
-        pub __statx_timestamp_pad1: [i32; 1],
-    }
-
     pub struct aiocb {
         pub aio_fildes: ::c_int,
         pub aio_lio_opcode: ::c_int,
@@ -1360,13 +1327,6 @@ extern "C" {
     pub fn getpt() -> ::c_int;
     pub fn mallopt(param: ::c_int, value: ::c_int) -> ::c_int;
     pub fn gettimeofday(tp: *mut ::timeval, tz: *mut ::timezone) -> ::c_int;
-    pub fn statx(
-        dirfd: ::c_int,
-        pathname: *const c_char,
-        flags: ::c_int,
-        mask: ::c_uint,
-        statxbuf: *mut statx,
-    ) -> ::c_int;
     pub fn getentropy(buf: *mut ::c_void, buflen: ::size_t) -> ::c_int;
     pub fn getrandom(buf: *mut ::c_void, buflen: ::size_t, flags: ::c_uint) -> ::ssize_t;
     pub fn getauxval(type_: ::c_ulong) -> ::c_ulong;

src/unix/linux_like/mod.rs

@@ -204,6 +204,39 @@ s! {
         pub msg_hdr: ::msghdr,
         pub msg_len: ::c_uint,
     }
+
+    pub struct statx {
+        pub stx_mask: u32,
+        pub stx_blksize: u32,
+        pub stx_attributes: u64,
+        pub stx_nlink: u32,
+        pub stx_uid: u32,
+        pub stx_gid: u32,
+        pub stx_mode: u16,
+        __statx_pad1: [u16; 1],
+        pub stx_ino: u64,
+        pub stx_size: u64,
+        pub stx_blocks: u64,
+        pub stx_attributes_mask: u64,
+        pub stx_atime: statx_timestamp,
+        pub stx_btime: statx_timestamp,
+        pub stx_ctime: statx_timestamp,
+        pub stx_mtime: statx_timestamp,
+        pub stx_rdev_major: u32,
+        pub stx_rdev_minor: u32,
+        pub stx_dev_major: u32,
+        pub stx_dev_minor: u32,
+        pub stx_mnt_id: u64,
+        pub stx_dio_mem_align: u32,
+        pub stx_dio_offset_align: u32,
+        __statx_pad3: [u64; 12],
+    }
+
+    pub struct statx_timestamp {
+        pub tv_sec: i64,
+        pub tv_nsec: u32,
+        __statx_timestamp_pad1: [i32; 1],
+    }
 }
 
 s_no_extra_traits! {
@@ -1886,6 +1919,21 @@ cfg_if! {
     }
 }
 
+// The statx syscall, available on some libcs.
+cfg_if! {
+    if #[cfg(any(target_env = "gnu", target_os = "android"))] {
+        extern "C" {
+            pub fn statx(
+                dirfd: ::c_int,
+                pathname: *const c_char,
+                flags: ::c_int,
+                mask: ::c_uint,
+                statxbuf: *mut statx,
+            ) -> ::c_int;
+        }
+    }
+}
+
 cfg_if! {
     if #[cfg(target_os = "emscripten")] {
         mod emscripten;