From patchwork Wed Apr 18 20:17:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Albert ARIBAUD X-Patchwork-Id: 26804 Received: (qmail 111241 invoked by alias); 18 Apr 2018 20:20:26 -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 111138 invoked by uid 89); 18 Apr 2018 20:20:25 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, KAM_NUMSUBJECT, RCVD_IN_DNSWL_LOW, RCVD_IN_RP_RNBL autolearn=ham version=3.3.2 spammy=3111 X-HELO: smtp3-g21.free.fr From: "Albert ARIBAUD (3ADEV)" To: libc-alpha@sourceware.org Cc: "Albert ARIBAUD (3ADEV)" Subject: [[PATCH RFC 2] 25/63] Y2038: add function __lutimes64 Date: Wed, 18 Apr 2018 22:17:41 +0200 Message-Id: <20180418201819.15952-26-albert.aribaud@3adev.fr> In-Reply-To: <20180418201819.15952-25-albert.aribaud@3adev.fr> References: <20180418201819.15952-1-albert.aribaud@3adev.fr> <20180418201819.15952-2-albert.aribaud@3adev.fr> <20180418201819.15952-3-albert.aribaud@3adev.fr> <20180418201819.15952-4-albert.aribaud@3adev.fr> <20180418201819.15952-5-albert.aribaud@3adev.fr> <20180418201819.15952-6-albert.aribaud@3adev.fr> <20180418201819.15952-7-albert.aribaud@3adev.fr> <20180418201819.15952-8-albert.aribaud@3adev.fr> <20180418201819.15952-9-albert.aribaud@3adev.fr> <20180418201819.15952-10-albert.aribaud@3adev.fr> <20180418201819.15952-11-albert.aribaud@3adev.fr> <20180418201819.15952-12-albert.aribaud@3adev.fr> <20180418201819.15952-13-albert.aribaud@3adev.fr> <20180418201819.15952-14-albert.aribaud@3adev.fr> <20180418201819.15952-15-albert.aribaud@3adev.fr> <20180418201819.15952-16-albert.aribaud@3adev.fr> <20180418201819.15952-17-albert.aribaud@3adev.fr> <20180418201819.15952-18-albert.aribaud@3adev.fr> <20180418201819.15952-19-albert.aribaud@3adev.fr> <20180418201819.15952-20-albert.aribaud@3adev.fr> <20180418201819.15952-21-albert.aribaud@3adev.fr> <20180418201819.15952-22-albert.aribaud@3adev.fr> <20180418201819.15952-23-albert.aribaud@3adev.fr> <20180418201819.15952-24-albert.aribaud@3adev.fr> <20180418201819.15952-25-albert.aribaud@3adev.fr> --- misc/lutimes.c | 8 ++++++ sysdeps/unix/sysv/linux/lutimes.c | 58 +++++++++++++++++++++++++++++++++++++++ time/Versions | 1 + 3 files changed, 67 insertions(+) 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; } }