From patchwork Thu Sep 7 22:41:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Albert ARIBAUD X-Patchwork-Id: 22724 Received: (qmail 73928 invoked by alias); 7 Sep 2017 22:43:36 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 73845 invoked by uid 89); 7 Sep 2017 22:43:36 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 spammy= X-HELO: smtp6-g21.free.fr From: "Albert ARIBAUD (3ADEV)" To: libc-alpha@sourceware.org Cc: "Albert ARIBAUD (3ADEV)" Subject: [RFC PATCH 16/52] Y2038: add function __futimes64 Date: Fri, 8 Sep 2017 00:41:43 +0200 Message-Id: <20170907224219.12483-17-albert.aribaud@3adev.fr> In-Reply-To: <20170907224219.12483-16-albert.aribaud@3adev.fr> References: <20170907224219.12483-1-albert.aribaud@3adev.fr> <20170907224219.12483-2-albert.aribaud@3adev.fr> <20170907224219.12483-3-albert.aribaud@3adev.fr> <20170907224219.12483-4-albert.aribaud@3adev.fr> <20170907224219.12483-5-albert.aribaud@3adev.fr> <20170907224219.12483-6-albert.aribaud@3adev.fr> <20170907224219.12483-7-albert.aribaud@3adev.fr> <20170907224219.12483-8-albert.aribaud@3adev.fr> <20170907224219.12483-9-albert.aribaud@3adev.fr> <20170907224219.12483-10-albert.aribaud@3adev.fr> <20170907224219.12483-11-albert.aribaud@3adev.fr> <20170907224219.12483-12-albert.aribaud@3adev.fr> <20170907224219.12483-13-albert.aribaud@3adev.fr> <20170907224219.12483-14-albert.aribaud@3adev.fr> <20170907224219.12483-15-albert.aribaud@3adev.fr> <20170907224219.12483-16-albert.aribaud@3adev.fr> Signed-off-by: Albert ARIBAUD (3ADEV) --- misc/futimes.c | 9 +++++++ sysdeps/unix/sysv/linux/arm/Versions | 1 + sysdeps/unix/sysv/linux/futimes.c | 52 ++++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+) diff --git a/misc/futimes.c b/misc/futimes.c index 6dad9996fa..e4c9ee2239 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/arm/Versions b/sysdeps/unix/sysv/linux/arm/Versions index 630e3f8569..155b7889eb 100644 --- a/sysdeps/unix/sysv/linux/arm/Versions +++ b/sysdeps/unix/sysv/linux/arm/Versions @@ -36,5 +36,6 @@ libc { __futimens64; __utimensat64; __sigtimedwait64; + __futimes64; } } diff --git a/sysdeps/unix/sysv/linux/futimes.c b/sysdeps/unix/sysv/linux/futimes.c index af79cb1508..f30e6ad7a0 100644 --- a/sysdeps/unix/sysv/linux/futimes.c +++ b/sysdeps/unix/sysv/linux/futimes.c @@ -49,3 +49,55 @@ __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]) +{ + /* The utimensat system call expects timespec not timeval. */ + struct __timespec64 ts64[2]; + struct timespec ts32[2]; + + 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; + + return INLINE_SYSCALL (utimensat64, 4, fd, NULL, &ts64, 0); + } + + return INLINE_SYSCALL (utimensat64, 4, fd, NULL, NULL, 0); + } + + 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; + + return INLINE_SYSCALL (utimensat, 4, fd, NULL, &ts32, 0); + } + + return INLINE_SYSCALL (utimensat, 4, fd, NULL, NULL, 0); +}