From 9b845d45d1659b0f9693eb3f3d6b533449c61d4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 7 Jul 2017 01:09:13 +0100 Subject: [PATCH] harmonize dirent->d_ino according to posix POSIX 2004 states that dirent shall include the field `d_ino` of type `ino_t`: http://pubs.opengroup.org/onlinepubs/009695399/basedefs/dirent.h.html Updated darwin/dragonfly/freebsd and netbsd definitions to met POSIX and make portable use easier. --- src/unix/bsd/apple/mod.rs | 2 +- src/unix/bsd/freebsdlike/dragonfly/mod.rs | 2 +- src/unix/bsd/freebsdlike/freebsd/mod.rs | 2 +- src/unix/bsd/netbsdlike/netbsd/mod.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/unix/bsd/apple/mod.rs b/src/unix/bsd/apple/mod.rs index 6652bb8c09f96..61e25d915d315 100644 --- a/src/unix/bsd/apple/mod.rs +++ b/src/unix/bsd/apple/mod.rs @@ -113,7 +113,7 @@ s! { } pub struct dirent { - pub d_ino: u64, + pub d_ino: ino_t, pub d_seekoff: u64, pub d_reclen: u16, pub d_namlen: u16, diff --git a/src/unix/bsd/freebsdlike/dragonfly/mod.rs b/src/unix/bsd/freebsdlike/dragonfly/mod.rs index e60825a5226a0..1b2bd52f1d312 100644 --- a/src/unix/bsd/freebsdlike/dragonfly/mod.rs +++ b/src/unix/bsd/freebsdlike/dragonfly/mod.rs @@ -55,7 +55,7 @@ s! { } pub struct dirent { - pub d_fileno: ::ino_t, + pub d_ino: ::ino_t, pub d_namlen: u16, pub d_type: u8, __unused1: u8, diff --git a/src/unix/bsd/freebsdlike/freebsd/mod.rs b/src/unix/bsd/freebsdlike/freebsd/mod.rs index 32bca9ae9d3e7..1c93b1557a3e9 100644 --- a/src/unix/bsd/freebsdlike/freebsd/mod.rs +++ b/src/unix/bsd/freebsdlike/freebsd/mod.rs @@ -44,7 +44,7 @@ s! { } pub struct dirent { - pub d_fileno: u32, + pub d_ino: ::ino_t, pub d_reclen: u16, pub d_type: u8, pub d_namlen: u8, diff --git a/src/unix/bsd/netbsdlike/netbsd/mod.rs b/src/unix/bsd/netbsdlike/netbsd/mod.rs index 2078c59d8193d..bea686e68a1a5 100644 --- a/src/unix/bsd/netbsdlike/netbsd/mod.rs +++ b/src/unix/bsd/netbsdlike/netbsd/mod.rs @@ -21,7 +21,7 @@ s! { } pub struct dirent { - pub d_fileno: ::ino_t, + pub d_ino: ::ino_t, pub d_reclen: u16, pub d_namlen: u16, pub d_type: u8,