Skip to content

fix: use Padding in stat padding fields #5497

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

Closed
xtqqczze wants to merge 1 commit into from
Closed

fix: use Padding in stat padding fields #5497

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
4 changes: 2 additions & 2 deletions src/unix/bsd/apple/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,8 +333,8 @@ s! {
pub st_blksize: blksize_t,
pub st_flags: u32,
pub st_gen: u32,
pub st_lspare: i32,
pub st_qspare: [i64; 2],
st_lspare: Padding<i32>,
st_qspare: Padding<[i64; 2]>,
}

pub struct siginfo_t {
Expand Down
4 changes: 2 additions & 2 deletions src/unix/bsd/freebsdlike/dragonfly/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,9 @@ s! {
pub __old_st_blksize: u32,

@dybucc dybucc Sep 7, 2026 •
edited by rustbot
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is not part of #5444.

View changes since the review

pub st_flags: u32,
pub st_gen: u32,
pub st_lspare: i32,
st_lspare: Padding<i32>,
pub st_blksize: i64,
pub st_qspare2: i64,
st_qspare2: Padding<i64>,
}

pub struct if_data {
Expand Down
2 changes: 1 addition & 1 deletion src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ s! {
pub st_blksize: crate::blksize_t,
pub st_flags: crate::fflags_t,
pub st_gen: u32,
pub st_lspare: i32,
st_lspare: Padding<i32>,
pub st_birthtime: crate::time_t,
pub st_birthtime_nsec: c_long,
__unused: Padding<[u8; 8]>,
Expand Down
2 changes: 1 addition & 1 deletion src/unix/bsd/freebsdlike/freebsd/freebsd11/b64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ s! {
pub st_blksize: crate::blksize_t,
pub st_flags: crate::fflags_t,
pub st_gen: u32,
pub st_lspare: i32,
st_lspare: Padding<i32>,
pub st_birthtime: crate::time_t,
pub st_birthtime_nsec: c_long,
}
Expand Down
2 changes: 1 addition & 1 deletion src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ s! {
pub st_blksize: crate::blksize_t,
pub st_flags: crate::fflags_t,
pub st_gen: u64,
pub st_spare: [u64; 10],
st_spare: Padding<[u64; 10]>,
}

pub struct dirent {
Expand Down
2 changes: 1 addition & 1 deletion src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ s! {
pub st_blksize: crate::blksize_t,
pub st_flags: crate::fflags_t,
pub st_gen: u64,
pub st_spare: [u64; 10],
st_spare: Padding<[u64; 10]>,
}

pub struct dirent {
Expand Down
2 changes: 1 addition & 1 deletion src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ s! {
pub st_flags: crate::fflags_t,
pub st_gen: u64,
pub st_filerev: u64,
pub st_spare: [u64; 9],
st_spare: Padding<[u64; 9]>,
}

pub struct dirent {
Expand Down
2 changes: 1 addition & 1 deletion src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ s! {
pub st_flags: crate::fflags_t,
pub st_gen: u64,
pub st_filerev: u64,
pub st_spare: [u64; 9],
st_spare: Padding<[u64; 9]>,
}

pub struct dirent {
Expand Down
2 changes: 1 addition & 1 deletion src/unix/bsd/netbsdlike/netbsd/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ s! {
pub st_blksize: crate::blksize_t,
pub st_flags: u32,
pub st_gen: u32,
pub st_spare: [u32; 2],
st_spare: Padding<[u32; 2]>,
}

pub struct addrinfo {
Expand Down
12 changes: 6 additions & 6 deletions src/unix/linux_like/l4re/uclibc/aarch64/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,34 +22,34 @@ pub type __u64 = c_ulong;
s! {
pub struct stat {
pub st_dev: c_ulong,
pub __pad1: c_ushort,
__pad1: Padding<c_ushort>,
pub st_ino: crate::ino_t,
pub st_mode: crate::mode_t,
pub st_nlink: nlink_t,
pub st_uid: crate::uid_t,
pub st_gid: crate::gid_t,
pub st_rdev: c_ulong,
pub __pad2: c_ushort,
__pad2: Padding<c_ushort>,
pub st_size: crate::off64_t,
pub st_blksize: blksize_t,
pub st_blocks: crate::blkcnt64_t,
pub st_atim: crate::timespec,
pub st_mtim: crate::timespec,
pub st_ctim: crate::timespec,
pub __uclibc_unused4: c_ulong,
pub __uclibc_unused5: c_ulong,
__uclibc_unused4: Padding<c_ulong>,
__uclibc_unused5: Padding<c_ulong>,
}

pub struct stat64 {
pub st_dev: c_ulong,
pub __pad1: c_uint,
__pad1: Padding<c_uint>,
pub __st_ino: crate::ino_t,
pub st_mode: crate::mode_t,
pub st_nlink: nlink_t,
pub st_uid: crate::uid_t,
pub st_gid: crate::gid_t,
pub st_rdev: c_ulong,
pub __pad2: c_uint,
__pad2: Padding<c_uint>,
pub st_size: crate::off64_t,
pub st_blksize: blksize_t,
pub st_blocks: crate::blkcnt64_t,
Expand Down
4 changes: 2 additions & 2 deletions src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ s! {
pub st_uid: crate::uid_t,
pub st_gid: crate::gid_t,
pub st_rdev: crate::dev_t,
pub __pad1: crate::dev_t,
__pad1: Padding<crate::dev_t>,
pub st_size: off64_t,
pub st_blksize: crate::blksize_t,
pub __pad2: c_int,
__pad2: Padding<c_int>,
pub st_blocks: crate::blkcnt64_t,
pub st_atime: crate::time_t,
pub st_atime_nsec: c_long,
Expand Down
4 changes: 2 additions & 2 deletions src/unix/linux_like/linux/gnu/b64/loongarch64/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ s! {
pub st_uid: crate::uid_t,
pub st_gid: crate::gid_t,
pub st_rdev: crate::dev_t,
pub __pad1: crate::dev_t,
__pad1: Padding<crate::dev_t>,
pub st_size: off64_t,
pub st_blksize: crate::blksize_t,
pub __pad2: c_int,
__pad2: Padding<c_int>,
pub st_blocks: crate::blkcnt_t,
pub st_atime: crate::time_t,
pub st_atime_nsec: c_long,
Expand Down
8 changes: 4 additions & 4 deletions src/unix/linux_like/linux/gnu/b64/riscv64/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ s! {
pub st_uid: crate::uid_t,
pub st_gid: crate::gid_t,
pub st_rdev: crate::dev_t,
pub __pad1: crate::dev_t,
__pad1: Padding<crate::dev_t>,
pub st_size: off_t,
pub st_blksize: crate::blksize_t,
pub __pad2: c_int,
__pad2: Padding<c_int>,
pub st_blocks: crate::blkcnt_t,
pub st_atime: crate::time_t,
pub st_atime_nsec: c_long,
Expand All @@ -49,10 +49,10 @@ s! {
pub st_uid: crate::uid_t,
pub st_gid: crate::gid_t,
pub st_rdev: crate::dev_t,
pub __pad1: crate::dev_t,
__pad1: Padding<crate::dev_t>,
pub st_size: off64_t,
pub st_blksize: crate::blksize_t,
pub __pad2: c_int,
__pad2: Padding<c_int>,
pub st_blocks: crate::blkcnt_t,
pub st_atime: crate::time_t,
pub st_atime_nsec: c_long,
Expand Down
4 changes: 2 additions & 2 deletions src/unix/linux_like/linux/uclibc/arm/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ s! {

pub struct stat64 {
pub st_dev: c_ulonglong,
pub __pad1: c_uint,
__pad1: Padding<c_uint>,
pub __st_ino: crate::ino_t,
pub st_mode: crate::mode_t,
pub st_nlink: crate::nlink_t,
pub st_uid: crate::uid_t,
pub st_gid: crate::gid_t,
pub st_rdev: c_ulonglong,
pub __pad2: c_uint,
__pad2: Padding<c_uint>,
pub st_size: off64_t,
pub st_blksize: crate::blksize_t,
pub st_blocks: crate::blkcnt64_t,
Expand Down
2 changes: 1 addition & 1 deletion src/unix/newlib/horizon/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ s! {
pub st_ctim: crate::timespec,
pub st_blksize: crate::blksize_t,
pub st_blocks: crate::blkcnt_t,
pub st_spare4: [c_long; 2usize],
st_spare4: Padding<[c_long; 2usize]>,
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/unix/newlib/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ s! {
pub st_ctim: crate::timespec,
pub st_blksize: crate::blksize_t,
pub st_blocks: crate::blkcnt_t,
pub st_spare4: [c_long; 2usize],
st_spare4: Padding<[c_long; 2usize]>,
}

#[cfg(not(target_os = "vita"))]
Expand Down
2 changes: 1 addition & 1 deletion src/unix/newlib/vita/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ s! {
pub st_ctime: crate::time_t,
pub st_blksize: crate::blksize_t,
pub st_blocks: crate::blkcnt_t,
pub st_spare4: [c_long; 2usize],
st_spare4: Padding<[c_long; 2usize]>,
}

#[repr(align(8))]
Expand Down
Loading