diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/stat.h | 39 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/kernel_stat.h | 18 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/xstatconv.c | 54 |
3 files changed, 54 insertions, 57 deletions
diff --git a/sysdeps/unix/sysv/linux/bits/stat.h b/sysdeps/unix/sysv/linux/bits/stat.h index 42ecd04e06..790fdbbafd 100644 --- a/sysdeps/unix/sysv/linux/bits/stat.h +++ b/sysdeps/unix/sysv/linux/bits/stat.h @@ -60,12 +60,27 @@ struct stat #else __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ #endif +#ifdef __USE_MISC + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the + identifier 'timespec' to appear in the <sys/stat.h> header. + Therefore we have to handle the use of this header in strictly + standard-compliant sources special. */ + struct timespec st_atim; /* Time of last access. */ + struct timespec st_mtim; /* Time of last modification. */ + struct timespec st_ctim; /* Time of last status change. */ +# define st_atime st_atim.tv_sec /* Backward compatibility. */ +# define st_mtime st_mtim.tv_sec +# define st_ctime st_ctim.tv_sec +#else __time_t st_atime; /* Time of last access. */ - unsigned long int __unused1; + unsigned long int st_atimensec; /* Nscecs of last access. */ __time_t st_mtime; /* Time of last modification. */ - unsigned long int __unused2; + unsigned long int st_mtimensec; /* Nsecs of last modification. */ __time_t st_ctime; /* Time of last status change. */ - unsigned long int __unused3; + unsigned long int st_ctimensec; /* Nsecs of last status change. */ +#endif #ifndef __USE_FILE_OFFSET64 unsigned long int __unused4; unsigned long int __unused5; @@ -91,12 +106,24 @@ struct stat64 __blksize_t st_blksize; /* Optimal block size for I/O. */ __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ +#ifdef __USE_MISC + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the + identifier 'timespec' to appear in the <sys/stat.h> header. + Therefore we have to handle the use of this header in strictly + standard-compliant sources special. */ + struct timespec st_atim; /* Time of last access. */ + struct timespec st_mtim; /* Time of last modification. */ + struct timespec st_ctim; /* Time of last status change. */ +#else __time_t st_atime; /* Time of last access. */ - unsigned long int __unused1; + unsigned long int st_atimensec; /* Nscecs of last access. */ __time_t st_mtime; /* Time of last modification. */ - unsigned long int __unused2; + unsigned long int st_mtimensec; /* Nsecs of last modification. */ __time_t st_ctime; /* Time of last status change. */ - unsigned long int __unused3; + unsigned long int st_ctimensec; /* Nsecs of last status change. */ +#endif __ino64_t st_ino; /* File serial number. */ }; #endif diff --git a/sysdeps/unix/sysv/linux/kernel_stat.h b/sysdeps/unix/sysv/linux/kernel_stat.h index 7f4f91f43e..4146bb240f 100644 --- a/sysdeps/unix/sysv/linux/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/kernel_stat.h @@ -15,31 +15,19 @@ struct kernel_stat unsigned long int st_size; unsigned long int st_blksize; unsigned long int st_blocks; - unsigned long int st_atime; - unsigned long int __unused1; -#define _HAVE___UNUSED1 - unsigned long int st_mtime; - unsigned long int __unused2; -#define _HAVE___UNUSED2 - unsigned long int st_ctime; - unsigned long int __unused3; -#define _HAVE___UNUSED3 + struct timespec st_atim; + struct timespec st_mtim; + struct timespec st_ctim; unsigned long int __unused4; #define _HAVE___UNUSED4 unsigned long int __unused5; #define _HAVE___UNUSED5 }; -#define _HAVE_STAT___UNUSED1 -#define _HAVE_STAT___UNUSED2 -#define _HAVE_STAT___UNUSED3 #define _HAVE_STAT___UNUSED4 #define _HAVE_STAT___UNUSED5 #define _HAVE_STAT___PAD1 #define _HAVE_STAT___PAD2 -#define _HAVE_STAT64___UNUSED1 -#define _HAVE_STAT64___UNUSED2 -#define _HAVE_STAT64___UNUSED3 #define _HAVE_STAT64___PAD1 #define _HAVE_STAT64___PAD2 #define _HAVE_STAT64___ST_INO diff --git a/sysdeps/unix/sysv/linux/xstatconv.c b/sysdeps/unix/sysv/linux/xstatconv.c index d1f5e17b07..063489af33 100644 --- a/sysdeps/unix/sysv/linux/xstatconv.c +++ b/sysdeps/unix/sysv/linux/xstatconv.c @@ -60,18 +60,12 @@ xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf) buf->st_size = kbuf->st_size; buf->st_blksize = kbuf->st_blksize; buf->st_blocks = kbuf->st_blocks; - buf->st_atime = kbuf->st_atime; -#ifdef _HAVE_STAT___UNUSED1 - buf->__unused1 = 0; -#endif - buf->st_mtime = kbuf->st_mtime; -#ifdef _HAVE_STAT___UNUSED2 - buf->__unused2 = 0; -#endif - buf->st_ctime = kbuf->st_ctime; -#ifdef _HAVE_STAT___UNUSED3 - buf->__unused3 = 0; -#endif + buf->st_atim.tv_sec = kbuf->st_atim.tv_sec; + buf->st_atim.tv_nsec = kbuf->st_atim.tv_nsec; + buf->st_mtim.tv_sec = kbuf->st_mtim.tv_sec; + buf->st_mtim.tv_nsec = kbuf->st_mtim.tv_nsec; + buf->st_ctim.tv_sec = kbuf->st_ctim.tv_sec; + buf->st_ctim.tv_nsec = kbuf->st_ctim.tv_nsec; #ifdef _HAVE_STAT___UNUSED4 buf->__unused4 = 0; #endif @@ -121,18 +115,12 @@ xstat64_conv (int vers, struct kernel_stat *kbuf, void *ubuf) buf->st_size = kbuf->st_size; buf->st_blksize = kbuf->st_blksize; buf->st_blocks = kbuf->st_blocks; - buf->st_atime = kbuf->st_atime; -#ifdef _HAVE_STAT64___UNUSED1 - buf->__unused1 = 0; -#endif - buf->st_mtime = kbuf->st_mtime; -#ifdef _HAVE_STAT64___UNUSED2 - buf->__unused2 = 0; -#endif - buf->st_ctime = kbuf->st_ctime; -#ifdef _HAVE_STAT64___UNUSED3 - buf->__unused3 = 0; -#endif + buf->st_atim.tv_sec = kbuf->st_atim.tv_sec; + buf->st_atim.tv_nsec = kbuf->st_atim.tv_nsec; + buf->st_mtim.tv_sec = kbuf->st_mtim.tv_sec; + buf->st_mtim.tv_nsec = kbuf->st_mtim.tv_nsec; + buf->st_ctim.tv_sec = kbuf->st_ctim.tv_sec; + buf->st_ctim.tv_nsec = kbuf->st_ctim.tv_nsec; #ifdef _HAVE_STAT64___UNUSED4 buf->__unused4 = 0; #endif @@ -216,18 +204,12 @@ xstat32_conv (int vers, struct stat64 *kbuf, struct stat *buf) __set_errno (EOVERFLOW); return -1; } - buf->st_atime = kbuf->st_atime; -#ifdef _HAVE_STAT___UNUSED1 - buf->__unused1 = 0; -#endif - buf->st_mtime = kbuf->st_mtime; -#ifdef _HAVE_STAT___UNUSED2 - buf->__unused2 = 0; -#endif - buf->st_ctime = kbuf->st_ctime; -#ifdef _HAVE_STAT___UNUSED3 - buf->__unused3 = 0; -#endif + buf->st_atim.tv_sec = kbuf->st_atim.tv_sec; + buf->st_atim.tv_nsec = kbuf->st_atim.tv_nsec; + buf->st_mtim.tv_sec = kbuf->st_mtim.tv_sec; + buf->st_mtim.tv_nsec = kbuf->st_mtim.tv_nsec; + buf->st_ctim.tv_sec = kbuf->st_ctim.tv_sec; + buf->st_ctim.tv_nsec = kbuf->st_ctim.tv_nsec; #ifdef _HAVE_STAT___UNUSED4 buf->__unused4 = 0; #endif |