diff options
author | Albert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr> | 2017-09-08 00:41:52 +0200 |
---|---|---|
committer | Albert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr> | 2018-10-24 12:53:27 +0200 |
commit | 84909c7b83f5659780ad1d419dd17848ca35e221 (patch) | |
tree | 45c0dcabd483185e39838c3e53ab35280ad194eb | |
parent | 088be4c6762ee5bede0560b2ad5dff6d334f62b0 (diff) | |
download | glibc-84909c7b83f5659780ad1d419dd17848ca35e221.tar glibc-84909c7b83f5659780ad1d419dd17848ca35e221.tar.gz glibc-84909c7b83f5659780ad1d419dd17848ca35e221.tar.bz2 glibc-84909c7b83f5659780ad1d419dd17848ca35e221.zip |
Y2038: add function __stat64_time64 (and __xstat64_time64)
These implementations just use the existing syscalls and convert from
kernel 32-bit-time struct stat64 to GLIBC Y2038-ready struct __stat64_t64.
-rw-r--r-- | include/sys/stat.h | 2 | ||||
-rw-r--r-- | io/Versions | 1 | ||||
-rw-r--r-- | io/stat64.c | 7 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/xstat64.c | 41 |
4 files changed, 51 insertions, 0 deletions
diff --git a/include/sys/stat.h b/include/sys/stat.h index c00f7b46d7..186df0c792 100644 --- a/include/sys/stat.h +++ b/include/sys/stat.h @@ -38,6 +38,8 @@ extern int __mknod (const char *__path, __mode_t __mode, __dev_t __dev); extern int __fxstat64_time64 (int __ver, int __fildes, struct __stat64_t64 *__stat_buf); +extern int __xstat64_time64 (int __ver, const char *__filename, + struct __stat64_t64 *__stat_buf); #if IS_IN (libc) || (IS_IN (rtld) && !defined NO_RTLD_HIDDEN) hidden_proto (__fxstat) diff --git a/io/Versions b/io/Versions index 0d8f63c451..821e375bae 100644 --- a/io/Versions +++ b/io/Versions @@ -134,6 +134,7 @@ libc { } GLIBC_2.29 { __fxstat64_time64; + __xstat64_time64; } GLIBC_PRIVATE { __libc_fcntl64; diff --git a/io/stat64.c b/io/stat64.c index 5020551c0f..4ed632f42a 100644 --- a/io/stat64.c +++ b/io/stat64.c @@ -50,3 +50,10 @@ stat64 (const char *file, struct stat64 *buf) { return __xstat64 (_STAT_VER, file, buf); } + +int +attribute_hidden +__stat64_time64 (const char *file, struct __stat64_t64 *buf) +{ + return __xstat64_time64 (_STAT_VER, file, buf); +} diff --git a/sysdeps/unix/sysv/linux/xstat64.c b/sysdeps/unix/sysv/linux/xstat64.c index afc9ba2cb7..e0341c1bd3 100644 --- a/sysdeps/unix/sysv/linux/xstat64.c +++ b/sysdeps/unix/sysv/linux/xstat64.c @@ -52,3 +52,44 @@ hidden_ver (___xstat64, __xstat64) strong_alias (___xstat64, __xstat64) hidden_def (__xstat64) #endif + +/* 64-bit time version */ + +int +__xstat64_time64 (int vers, const char *name, struct __stat64_t64 *buf) +{ + int result; + struct stat64 st64; + + result = INLINE_SYSCALL (stat64, 2, name, &st64); +#if defined _HAVE_STAT64___ST_INO && !__ASSUME_ST_INO_64_BIT + if (__builtin_expect (!result, 1) && st64.__st_ino != (__ino_t) st64.st_ino) + st64.st_ino = st64.__st_ino; +#endif + if (!result) + { + buf->st_dev = st64.st_dev; +#if defined _HAVE_STAT64___ST_INO + buf->__st_ino = st64.__st_ino; +#endif + buf->st_mode = st64.st_mode; + buf->st_nlink = st64.st_nlink; + buf->st_uid = st64.st_uid; + buf->st_gid = st64.st_gid; + buf->st_rdev = st64.st_rdev; + buf->st_size = st64.st_size; + buf->st_blksize = st64.st_blksize; + + buf->st_blocks = st64.st_blocks; + + buf->st_atim.tv_sec = st64.st_atim.tv_sec; + buf->st_atim.tv_nsec = st64.st_atim.tv_nsec; + buf->st_mtim.tv_sec = st64.st_mtim.tv_sec; + buf->st_mtim.tv_nsec = st64.st_mtim.tv_nsec; + buf->st_ctim.tv_sec = st64.st_ctim.tv_sec; + buf->st_ctim.tv_nsec = st64.st_ctim.tv_nsec; + + buf->st_ino = st64.st_ino; + } + return result; +} |