Update stat structs

Author: snogge

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

@@ -57,14 +57,12 @@ s! {
 
     pub struct stat64 {
         pub st_dev: ::dev_t,
-        __pad1: ::c_uint,
-        __st_ino: ::ino_t,
+        pub st_ino: ::ino_t,
         pub st_mode: ::mode_t,
         pub st_nlink: ::nlink_t,
         pub st_uid: ::uid_t,
         pub st_gid: ::gid_t,
         pub st_rdev: ::dev_t,
-        __pad2: ::c_uint,
         pub st_size: ::off64_t,
         pub st_blksize: ::blksize_t,
         pub st_blocks: ::blkcnt64_t,
@@ -74,7 +72,6 @@ s! {
         pub st_mtime_nsec: ::c_long,
         pub st_ctime: ::time_t,
         pub st_ctime_nsec: ::c_long,
-        pub st_ino: ::ino64_t,
     }
 
     pub struct statfs64 {

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

@@ -3,26 +3,25 @@ pub type wchar_t = i32;
 
 s! {
     pub struct stat64 {
-        pub st_dev: ::c_ulong,
-        st_pad1: [::c_long; 3],
+        pub st_dev: ::dev_t,
         pub st_ino: ::ino64_t,
         pub st_mode: ::mode_t,
         pub st_nlink: ::nlink_t,
         pub st_uid: ::uid_t,
         pub st_gid: ::gid_t,
-        pub st_rdev: ::c_ulong,
-        st_pad2: [::c_long; 2],
+        pub st_rdev: ::dev_t,
         pub st_size: ::off64_t,
+        pub st_blksize: ::blksize_t,
+        pub st_blocks: ::blkcnt64_t,
         pub st_atime: ::time_t,
+        __pad1: i32,
         pub st_atime_nsec: ::c_long,
         pub st_mtime: ::time_t,
+        __pad2: i32,
         pub st_mtime_nsec: ::c_long,
         pub st_ctime: ::time_t,
+        __pad3: i32,
         pub st_ctime_nsec: ::c_long,
-        pub st_blksize: ::blksize_t,
-        st_pad3: ::c_long,
-        pub st_blocks: ::blkcnt64_t,
-        st_pad5: [::c_long; 14],
     }
 
     pub struct statfs {

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

@@ -43,51 +43,34 @@ cfg_if! {
 
 s! {
     pub struct stat {
-        #[cfg(not(target_arch = "mips"))]
         pub st_dev: ::dev_t,
-        #[cfg(target_arch = "mips")]
-        pub st_dev: ::c_ulong,
-
-        #[cfg(not(target_arch = "mips"))]
-        __pad1: ::c_short,
-        #[cfg(target_arch = "mips")]
-        st_pad1: [::c_long; 3],
         pub st_ino: ::ino_t,
         pub st_mode: ::mode_t,
         pub st_nlink: ::nlink_t,
         pub st_uid: ::uid_t,
         pub st_gid: ::gid_t,
-        #[cfg(not(target_arch = "mips"))]
         pub st_rdev: ::dev_t,
-        #[cfg(target_arch = "mips")]
-        pub st_rdev: ::c_ulong,
-        #[cfg(not(target_arch = "mips"))]
-        __pad2: ::c_short,
-        #[cfg(target_arch = "mips")]
-        st_pad2: [::c_long; 2],
         pub st_size: ::off_t,
-        #[cfg(target_arch = "mips")]
-        st_pad3: ::c_long,
-        #[cfg(not(target_arch = "mips"))]
         pub st_blksize: ::blksize_t,
-        #[cfg(not(target_arch = "mips"))]
         pub st_blocks: ::blkcnt_t,
         pub st_atime: ::time_t,
+        #[cfg(all(any(target_arch = "mips", target_arch = "powerpc"), target_pointer_width = "32"))]
+        __pad1: i32,
         pub st_atime_nsec: ::c_long,
+        #[cfg(not(all(any(target_arch = "mips", target_arch = "powerpc"), target_pointer_width = "32")))]
+        __pad1: i32,
         pub st_mtime: ::time_t,
+        #[cfg(all(any(target_arch = "mips", target_arch = "powerpc"), target_pointer_width = "32"))]
+        __pad2: i32,
         pub st_mtime_nsec: ::c_long,
+        #[cfg(not(all(any(target_arch = "mips", target_arch = "powerpc"), target_pointer_width = "32")))]
+        __pad2: i32,
         pub st_ctime: ::time_t,
+        #[cfg(all(any(target_arch = "mips", target_arch = "powerpc"), target_pointer_width = "32"))]
+        __pad3: i32,
         pub st_ctime_nsec: ::c_long,
-        #[cfg(not(target_arch = "mips"))]
-        __unused4: ::c_long,
-        #[cfg(not(target_arch = "mips"))]
-        __unused5: ::c_long,
-        #[cfg(target_arch = "mips")]
-        pub st_blksize: ::blksize_t,
-        #[cfg(target_arch = "mips")]
-        pub st_blocks: ::blkcnt_t,
-        #[cfg(target_arch = "mips")]
-        st_pad5: [::c_long; 14],
+        #[cfg(not(all(any(target_arch = "mips", target_arch = "powerpc"), target_pointer_width = "32")))]
+        __pad3: i32,
     }
 
     pub struct statvfs {

src/unix/linux_like/linux/gnu/b32/powerpc.rs

@@ -62,18 +62,18 @@ s! {
         pub st_uid: ::uid_t,
         pub st_gid: ::gid_t,
         pub st_rdev: ::dev_t,
-        __pad2: ::c_ushort,
         pub st_size: ::off64_t,
         pub st_blksize: ::blksize_t,
         pub st_blocks: ::blkcnt64_t,
         pub st_atime: ::time_t,
-        pub st_atime_nsec: ::c_long,
+         __pad1: i32,
+       pub st_atime_nsec: ::c_long,
         pub st_mtime: ::time_t,
+        __pad2: i32,
         pub st_mtime_nsec: ::c_long,
         pub st_ctime: ::time_t,
+        __pad3: i32,
         pub st_ctime_nsec: ::c_long,
-        __glibc_reserved4: ::c_ulong,
-        __glibc_reserved5: ::c_ulong,
     }
 
     pub struct statfs64 {

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

@@ -131,24 +131,24 @@ s! {
 
     pub struct stat64 {
         pub st_dev: ::dev_t,
-        __pad1: ::c_uint,
-        __st_ino: ::ino_t,
+        pub st_ino: ::ino_t,
         pub st_mode: ::mode_t,
         pub st_nlink: ::nlink_t,
         pub st_uid: ::uid_t,
         pub st_gid: ::gid_t,
         pub st_rdev: ::dev_t,
-        __pad2: ::c_uint,
         pub st_size: ::off64_t,
         pub st_blksize: ::blksize_t,
         pub st_blocks: ::blkcnt64_t,
         pub st_atime: ::time_t,
         pub st_atime_nsec: ::c_long,
+        __pad1: i32,
         pub st_mtime: ::time_t,
         pub st_mtime_nsec: ::c_long,
+        __pad2: i32,
         pub st_ctime: ::time_t,
         pub st_ctime_nsec: ::c_long,
-        pub st_ino: ::ino64_t,
+        __pad3: i32,
     }
 
     pub struct statfs64 {