From patchwork Wed Apr 18 20:18:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Albert ARIBAUD X-Patchwork-Id: 26825 Received: (qmail 123783 invoked by alias); 18 Apr 2018 20:22:01 -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 123639 invoked by uid 89); 18 Apr 2018 20:22:00 -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= X-HELO: smtp3-g21.free.fr From: "Albert ARIBAUD (3ADEV)" To: libc-alpha@sourceware.org Cc: "Albert ARIBAUD (3ADEV)" Subject: [[PATCH RFC 2] 46/63] Y2038: add function __adjtime64 Date: Wed, 18 Apr 2018 22:18:02 +0200 Message-Id: <20180418201819.15952-47-albert.aribaud@3adev.fr> In-Reply-To: <20180418201819.15952-46-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> <20180418201819.15952-26-albert.aribaud@3adev.fr> <20180418201819.15952-27-albert.aribaud@3adev.fr> <20180418201819.15952-28-albert.aribaud@3adev.fr> <20180418201819.15952-29-albert.aribaud@3adev.fr> <20180418201819.15952-30-albert.aribaud@3adev.fr> <20180418201819.15952-31-albert.aribaud@3adev.fr> <20180418201819.15952-32-albert.aribaud@3adev.fr> <20180418201819.15952-33-albert.aribaud@3adev.fr> <20180418201819.15952-34-albert.aribaud@3adev.fr> <20180418201819.15952-35-albert.aribaud@3adev.fr> <20180418201819.15952-36-albert.aribaud@3adev.fr> <20180418201819.15952-37-albert.aribaud@3adev.fr> <20180418201819.15952-38-albert.aribaud@3adev.fr> <20180418201819.15952-39-albert.aribaud@3adev.fr> <20180418201819.15952-40-albert.aribaud@3adev.fr> <20180418201819.15952-41-albert.aribaud@3adev.fr> <20180418201819.15952-42-albert.aribaud@3adev.fr> <20180418201819.15952-43-albert.aribaud@3adev.fr> <20180418201819.15952-44-albert.aribaud@3adev.fr> <20180418201819.15952-45-albert.aribaud@3adev.fr> <20180418201819.15952-46-albert.aribaud@3adev.fr> --- sysdeps/unix/sysv/linux/adjtime.c | 43 +++++++++++++++++++++++++++++++++++++++ time/Versions | 1 + time/adjtime.c | 10 +++++++++ 3 files changed, 54 insertions(+) diff --git a/sysdeps/unix/sysv/linux/adjtime.c b/sysdeps/unix/sysv/linux/adjtime.c index 6edecb70e8..9e9a4b4176 100644 --- a/sysdeps/unix/sysv/linux/adjtime.c +++ b/sysdeps/unix/sysv/linux/adjtime.c @@ -90,3 +90,46 @@ ADJTIME (const struct TIMEVAL *itv, struct TIMEVAL *otv) #ifdef NO_LOCAL_ADJTIME weak_alias (__adjtime, adjtime) #endif + +/* 64-bit time version */ + +extern int __y2038_linux_support; + +int __adjtime64 (const struct __timeval64 *itv, + struct __timeval64 *otv) +{ + struct TIMEX tntx; + + if (itv) + { + struct TIMEVAL tmp; + + /* We will do some check here. */ + tmp.tv_sec = itv->tv_sec + itv->tv_usec / 1000000L; + tmp.tv_usec = itv->tv_usec % 1000000L; + if (tmp.tv_sec > MAX_SEC || tmp.tv_sec < MIN_SEC) + return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); + tntx.offset = tmp.tv_usec + tmp.tv_sec * 1000000L; + tntx.modes = ADJ_OFFSET_SINGLESHOT; + } + else + tntx.modes = ADJ_OFFSET_SS_READ; + + if (__glibc_unlikely (ADJTIMEX (&tntx) < 0)) + return -1; + + if (otv) + { + if (tntx.offset < 0) + { + otv->tv_usec = -(-tntx.offset % 1000000); + otv->tv_sec = -(-tntx.offset / 1000000); + } + else + { + otv->tv_usec = tntx.offset % 1000000; + otv->tv_sec = tntx.offset / 1000000; + } + } + return 0; +} diff --git a/time/Versions b/time/Versions index 86ced5a7c7..c7e9379243 100644 --- a/time/Versions +++ b/time/Versions @@ -89,5 +89,6 @@ libc { __time64; __stime64; __utimes64; + __adjtime64; } } diff --git a/time/adjtime.c b/time/adjtime.c index 4a972d66cd..800715c016 100644 --- a/time/adjtime.c +++ b/time/adjtime.c @@ -31,3 +31,13 @@ __adjtime (const struct timeval *delta, struct timeval *olddelta) stub_warning (adjtime) weak_alias (__adjtime, adjtime) + +/* 64-bit time version */ + +int +__adjtime64 (const struct __timeval64 *delta, struct __timeval64 *olddelta) +{ + __set_errno (ENOSYS); + return -1; +} +stub_warning (__adjtime64)