diff options
-rw-r--r-- | misc/futimes.c | 9 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/futimes.c | 59 | ||||
-rw-r--r-- | time/Versions | 1 |
3 files changed, 69 insertions, 0 deletions
diff --git a/misc/futimes.c b/misc/futimes.c index 3ffa40b0b1..c8756a01d2 100644 --- a/misc/futimes.c +++ b/misc/futimes.c @@ -30,3 +30,12 @@ __futimes (int fd, const struct timeval tvp[2]) weak_alias (__futimes, futimes) stub_warning (futimes) + +int +__futimes64 (int fd, const struct __timeval64 tvp[2]) +{ + __set_errno (ENOSYS); + return -1; +} + +stub_warning (__futimes64) diff --git a/sysdeps/unix/sysv/linux/futimes.c b/sysdeps/unix/sysv/linux/futimes.c index 9e6267cda7..fb644d79af 100644 --- a/sysdeps/unix/sysv/linux/futimes.c +++ b/sysdeps/unix/sysv/linux/futimes.c @@ -49,3 +49,62 @@ __futimes (int fd, const struct timeval tvp[2]) return INLINE_SYSCALL (utimensat, 4, fd, NULL, tvp ? &ts : NULL, 0); } weak_alias (__futimes, futimes) + +/* 64-bit time version */ + +extern int __y2038_linux_support; + +int +__futimes64 (int fd, 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 utimensat 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, fd, NULL, ts64p, 0); + 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); + + if (tvp[0].tv_sec > INT_MAX || tvp[1].tv_sec > INT_MAX) + return INLINE_SYSCALL_ERROR_RETURN_VALUE (EOVERFLOW); + + 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, fd, NULL, ts32p, 0); +} diff --git a/time/Versions b/time/Versions index eec5f95610..40557720bf 100644 --- a/time/Versions +++ b/time/Versions @@ -82,5 +82,6 @@ libc { __futimens64; __utimensat64; __sigtimedwait64; + __futimes64; } } |