Skip to content

Commit 03fe6a9

Browse files
snoggesnogge
committed
Update stat structs
1 parent f5b5425 commit 03fe6a9

File tree

5 files changed

+28
-49
lines changed

5 files changed

+28
-49
lines changed

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,12 @@ s! {
5757

5858
pub struct stat64 {
5959
pub st_dev: ::dev_t,
60-
__pad1: ::c_uint,
61-
__st_ino: ::ino_t,
60+
pub st_ino: ::ino_t,
6261
pub st_mode: ::mode_t,
6362
pub st_nlink: ::nlink_t,
6463
pub st_uid: ::uid_t,
6564
pub st_gid: ::gid_t,
6665
pub st_rdev: ::dev_t,
67-
__pad2: ::c_uint,
6866
pub st_size: ::off64_t,
6967
pub st_blksize: ::blksize_t,
7068
pub st_blocks: ::blkcnt64_t,
@@ -74,7 +72,6 @@ s! {
7472
pub st_mtime_nsec: ::c_long,
7573
pub st_ctime: ::time_t,
7674
pub st_ctime_nsec: ::c_long,
77-
pub st_ino: ::ino64_t,
7875
}
7976

8077
pub struct statfs64 {

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,25 @@ pub type wchar_t = i32;
33

44
s! {
55
pub struct stat64 {
6-
pub st_dev: ::c_ulong,
7-
st_pad1: [::c_long; 3],
6+
pub st_dev: ::dev_t,
87
pub st_ino: ::ino64_t,
98
pub st_mode: ::mode_t,
109
pub st_nlink: ::nlink_t,
1110
pub st_uid: ::uid_t,
1211
pub st_gid: ::gid_t,
13-
pub st_rdev: ::c_ulong,
14-
st_pad2: [::c_long; 2],
12+
pub st_rdev: ::dev_t,
1513
pub st_size: ::off64_t,
14+
pub st_blksize: ::blksize_t,
15+
pub st_blocks: ::blkcnt64_t,
1616
pub st_atime: ::time_t,
17+
__pad1: i32,
1718
pub st_atime_nsec: ::c_long,
1819
pub st_mtime: ::time_t,
20+
__pad2: i32,
1921
pub st_mtime_nsec: ::c_long,
2022
pub st_ctime: ::time_t,
23+
__pad3: i32,
2124
pub st_ctime_nsec: ::c_long,
22-
pub st_blksize: ::blksize_t,
23-
st_pad3: ::c_long,
24-
pub st_blocks: ::blkcnt64_t,
25-
st_pad5: [::c_long; 14],
2625
}
2726

2827
pub struct statfs {

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

Lines changed: 12 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -43,51 +43,34 @@ cfg_if! {
4343

4444
s! {
4545
pub struct stat {
46-
#[cfg(not(target_arch = "mips"))]
4746
pub st_dev: ::dev_t,
48-
#[cfg(target_arch = "mips")]
49-
pub st_dev: ::c_ulong,
50-
51-
#[cfg(not(target_arch = "mips"))]
52-
__pad1: ::c_short,
53-
#[cfg(target_arch = "mips")]
54-
st_pad1: [::c_long; 3],
5547
pub st_ino: ::ino_t,
5648
pub st_mode: ::mode_t,
5749
pub st_nlink: ::nlink_t,
5850
pub st_uid: ::uid_t,
5951
pub st_gid: ::gid_t,
60-
#[cfg(not(target_arch = "mips"))]
6152
pub st_rdev: ::dev_t,
62-
#[cfg(target_arch = "mips")]
63-
pub st_rdev: ::c_ulong,
64-
#[cfg(not(target_arch = "mips"))]
65-
__pad2: ::c_short,
66-
#[cfg(target_arch = "mips")]
67-
st_pad2: [::c_long; 2],
6853
pub st_size: ::off_t,
69-
#[cfg(target_arch = "mips")]
70-
st_pad3: ::c_long,
71-
#[cfg(not(target_arch = "mips"))]
7254
pub st_blksize: ::blksize_t,
73-
#[cfg(not(target_arch = "mips"))]
7455
pub st_blocks: ::blkcnt_t,
7556
pub st_atime: ::time_t,
57+
#[cfg(all(any(target_arch = "mips", target_arch = "powerpc"), target_pointer_width = "32"))]
58+
__pad1: i32,
7659
pub st_atime_nsec: ::c_long,
60+
#[cfg(not(all(any(target_arch = "mips", target_arch = "powerpc"), target_pointer_width = "32")))]
61+
__pad1: i32,
7762
pub st_mtime: ::time_t,
63+
#[cfg(all(any(target_arch = "mips", target_arch = "powerpc"), target_pointer_width = "32"))]
64+
__pad2: i32,
7865
pub st_mtime_nsec: ::c_long,
66+
#[cfg(not(all(any(target_arch = "mips", target_arch = "powerpc"), target_pointer_width = "32")))]
67+
__pad2: i32,
7968
pub st_ctime: ::time_t,
69+
#[cfg(all(any(target_arch = "mips", target_arch = "powerpc"), target_pointer_width = "32"))]
70+
__pad3: i32,
8071
pub st_ctime_nsec: ::c_long,
81-
#[cfg(not(target_arch = "mips"))]
82-
__unused4: ::c_long,
83-
#[cfg(not(target_arch = "mips"))]
84-
__unused5: ::c_long,
85-
#[cfg(target_arch = "mips")]
86-
pub st_blksize: ::blksize_t,
87-
#[cfg(target_arch = "mips")]
88-
pub st_blocks: ::blkcnt_t,
89-
#[cfg(target_arch = "mips")]
90-
st_pad5: [::c_long; 14],
72+
#[cfg(not(all(any(target_arch = "mips", target_arch = "powerpc"), target_pointer_width = "32")))]
73+
__pad3: i32,
9174
}
9275

9376
pub struct statvfs {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,18 +62,18 @@ s! {
6262
pub st_uid: ::uid_t,
6363
pub st_gid: ::gid_t,
6464
pub st_rdev: ::dev_t,
65-
__pad2: ::c_ushort,
6665
pub st_size: ::off64_t,
6766
pub st_blksize: ::blksize_t,
6867
pub st_blocks: ::blkcnt64_t,
6968
pub st_atime: ::time_t,
70-
pub st_atime_nsec: ::c_long,
69+
__pad1: i32,
70+
pub st_atime_nsec: ::c_long,
7171
pub st_mtime: ::time_t,
72+
__pad2: i32,
7273
pub st_mtime_nsec: ::c_long,
7374
pub st_ctime: ::time_t,
75+
__pad3: i32,
7476
pub st_ctime_nsec: ::c_long,
75-
__glibc_reserved4: ::c_ulong,
76-
__glibc_reserved5: ::c_ulong,
7777
}
7878

7979
pub struct statfs64 {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,24 +131,24 @@ s! {
131131

132132
pub struct stat64 {
133133
pub st_dev: ::dev_t,
134-
__pad1: ::c_uint,
135-
__st_ino: ::ino_t,
134+
pub st_ino: ::ino_t,
136135
pub st_mode: ::mode_t,
137136
pub st_nlink: ::nlink_t,
138137
pub st_uid: ::uid_t,
139138
pub st_gid: ::gid_t,
140139
pub st_rdev: ::dev_t,
141-
__pad2: ::c_uint,
142140
pub st_size: ::off64_t,
143141
pub st_blksize: ::blksize_t,
144142
pub st_blocks: ::blkcnt64_t,
145143
pub st_atime: ::time_t,
146144
pub st_atime_nsec: ::c_long,
145+
__pad1: i32,
147146
pub st_mtime: ::time_t,
148147
pub st_mtime_nsec: ::c_long,
148+
__pad2: i32,
149149
pub st_ctime: ::time_t,
150150
pub st_ctime_nsec: ::c_long,
151-
pub st_ino: ::ino64_t,
151+
__pad3: i32,
152152
}
153153

154154
pub struct statfs64 {

0 commit comments

Comments
 (0)