diff options
author | Albert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr> | 2017-09-08 00:41:44 +0200 |
---|---|---|
committer | Albert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr> | 2018-04-11 22:39:43 +0200 |
commit | 4a466230da467e212fd1489ceed03b4ec9c1e1eb (patch) | |
tree | 8cbbf3dd611822ec12a9adea72818e7063bf7029 | |
parent | 247d97c7402663e95ef6344da36301f7bfc3ee8d (diff) | |
download | glibc-4a466230da467e212fd1489ceed03b4ec9c1e1eb.tar.gz |
Y2038: add function __lutimes64
-rw-r--r-- | misc/lutimes.c | 8 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/lutimes.c | 58 | ||||
-rw-r--r-- | time/Versions | 1 |
3 files changed, 67 insertions, 0 deletions
diff --git a/misc/lutimes.c b/misc/lutimes.c index b241c14c56..e4368999e1 100644 --- a/misc/lutimes.c +++ b/misc/lutimes.c @@ -31,3 +31,11 @@ __lutimes (const char *file, const struct timeval tvp[2]) weak_alias (__lutimes, lutimes) stub_warning (lutimes) + +int +__lutimes64 (const char *file, const struct __timeval64 tvp[2]) +{ + __set_errno (ENOSYS); + return -1; +} +stub_warning (__lutimes64) diff --git a/sysdeps/unix/sysv/linux/lutimes.c b/sysdeps/unix/sysv/linux/lutimes.c index 4f2f9ec7d6..175563e3b8 100644 --- a/sysdeps/unix/sysv/linux/lutimes.c +++ b/sysdeps/unix/sysv/linux/lutimes.c @@ -42,3 +42,61 @@ lutimes (const char *file, const struct timeval tvp[2]) return INLINE_SYSCALL (utimensat, 4, AT_FDCWD, file, tvp ? ts : NULL, AT_SYMLINK_NOFOLLOW); } + +/* 64-bit time version */ + +extern int __y2038_linux_support; + +int +__lutimes64 (const char *file, const struct __timeval64 tvp[2]) +{ + struct timespec ts32[2], *ts32p = NULL;; +/* Only try and use this syscall if defined by kernel */ +#ifdef __NR_utimensat64 + /* The system call expects timespec, not timeval. */ + struct __timespec64 ts64[2], *ts64p = NULL; + int result; +#endif + +/* Only try and use this syscall if defined by kernel */ +#ifdef __NR_utimensat64 + if (__y2038_linux_support) + { + if (tvp != NULL) + { + if (tvp[0].tv_usec < 0 || tvp[0].tv_usec >= 1000000 + || tvp[1].tv_usec < 0 || tvp[1].tv_usec >= 1000000) + return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); + + ts64[0].tv_sec = tvp[0].tv_sec; + ts64[0].tv_nsec = tvp[0].tv_usec * 1000; + ts64[0].tv_pad = 0; + ts64[1].tv_sec = tvp[1].tv_sec; + ts64[1].tv_nsec = tvp[1].tv_usec * 1000; + ts64[1].tv_pad = 0; + ts64p = ts64; + } + + result = INLINE_SYSCALL (utimensat64, 4, AT_FDCWD, file, ts64p, + AT_SYMLINK_NOFOLLOW); + if (result == 0 || errno == ENOSYS) + return result; + } +#endif + + if (tvp != NULL) + { + if (tvp[0].tv_usec < 0 || tvp[0].tv_usec >= 1000000 + || tvp[1].tv_usec < 0 || tvp[1].tv_usec >= 1000000) + return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); + + ts32[0].tv_sec = tvp[0].tv_sec; + ts32[0].tv_nsec = tvp[0].tv_usec * 1000; + ts32[1].tv_sec = tvp[1].tv_sec; + ts32[1].tv_nsec = tvp[1].tv_usec * 1000; + ts32p = ts32; + } + + return INLINE_SYSCALL (utimensat, 4, AT_FDCWD, file, ts32p, + AT_SYMLINK_NOFOLLOW); +} diff --git a/time/Versions b/time/Versions index 40557720bf..ac92d742c3 100644 --- a/time/Versions +++ b/time/Versions @@ -83,5 +83,6 @@ libc { __utimensat64; __sigtimedwait64; __futimes64; + __lutimes64; } } |