Skip to content

Commit e8733f1

Browse files
android: use proper types for dirent.d_ino, dirent.d_off, stat.st_mode
and stat64.st_mode This bug was noticed in termux/termux-packages#22609
1 parent 1867bf3 commit e8733f1

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

src/unix/linux_like/android/b32/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ s! {
3030
pub st_dev: c_ulonglong,
3131
__pad0: [c_uchar; 4],
3232
__st_ino: crate::ino_t,
33-
pub st_mode: c_uint,
33+
pub st_mode: crate::mode_t,
3434
pub st_nlink: crate::nlink_t,
3535
pub st_uid: crate::uid_t,
3636
pub st_gid: crate::gid_t,
@@ -52,7 +52,7 @@ s! {
5252
pub st_dev: c_ulonglong,
5353
__pad0: [c_uchar; 4],
5454
__st_ino: crate::ino_t,
55-
pub st_mode: c_uint,
55+
pub st_mode: crate::mode_t,
5656
pub st_nlink: crate::nlink_t,
5757
pub st_uid: crate::uid_t,
5858
pub st_gid: crate::gid_t,

src/unix/linux_like/android/b64/aarch64/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ s! {
99
pub struct stat {
1010
pub st_dev: crate::dev_t,
1111
pub st_ino: crate::ino_t,
12-
pub st_mode: c_uint,
12+
pub st_mode: crate::mode_t,
1313
pub st_nlink: crate::nlink_t,
1414
pub st_uid: crate::uid_t,
1515
pub st_gid: crate::gid_t,
@@ -32,7 +32,7 @@ s! {
3232
pub struct stat64 {
3333
pub st_dev: crate::dev_t,
3434
pub st_ino: crate::ino_t,
35-
pub st_mode: c_uint,
35+
pub st_mode: crate::mode_t,
3636
pub st_nlink: crate::nlink_t,
3737
pub st_uid: crate::uid_t,
3838
pub st_gid: crate::gid_t,

src/unix/linux_like/android/b64/riscv64/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ s! {
1010
pub struct stat {
1111
pub st_dev: crate::dev_t,
1212
pub st_ino: crate::ino_t,
13-
pub st_mode: c_uint,
13+
pub st_mode: crate::mode_t,
1414
pub st_nlink: c_uint,
1515
pub st_uid: crate::uid_t,
1616
pub st_gid: crate::gid_t,
@@ -33,7 +33,7 @@ s! {
3333
pub struct stat64 {
3434
pub st_dev: crate::dev_t,
3535
pub st_ino: crate::ino_t,
36-
pub st_mode: c_uint,
36+
pub st_mode: crate::mode_t,
3737
pub st_nlink: c_uint,
3838
pub st_uid: crate::uid_t,
3939
pub st_gid: crate::gid_t,

src/unix/linux_like/android/b64/x86_64/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ s! {
1111
pub st_dev: crate::dev_t,
1212
pub st_ino: crate::ino_t,
1313
pub st_nlink: c_ulong,
14-
pub st_mode: c_uint,
14+
pub st_mode: crate::mode_t,
1515
pub st_uid: crate::uid_t,
1616
pub st_gid: crate::gid_t,
1717
pub st_rdev: crate::dev_t,
@@ -31,7 +31,7 @@ s! {
3131
pub st_dev: crate::dev_t,
3232
pub st_ino: crate::ino_t,
3333
pub st_nlink: c_ulong,
34-
pub st_mode: c_uint,
34+
pub st_mode: crate::mode_t,
3535
pub st_uid: crate::uid_t,
3636
pub st_gid: crate::gid_t,
3737
pub st_rdev: crate::dev_t,

src/unix/linux_like/android/mod.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -528,16 +528,16 @@ s_no_extra_traits! {
528528
}
529529

530530
pub struct dirent {
531-
pub d_ino: u64,
532-
pub d_off: i64,
531+
pub d_ino: crate::ino_t,
532+
pub d_off: crate::off_t,
533533
pub d_reclen: c_ushort,
534534
pub d_type: c_uchar,
535535
pub d_name: [c_char; 256],
536536
}
537537

538538
pub struct dirent64 {
539-
pub d_ino: u64,
540-
pub d_off: i64,
539+
pub d_ino: crate::ino64_t,
540+
pub d_off: crate::off_t,
541541
pub d_reclen: c_ushort,
542542
pub d_type: c_uchar,
543543
pub d_name: [c_char; 256],

0 commit comments

Comments
 (0)