From patchwork Tue Dec 18 14:09:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Albert ARIBAUD (3ADEV)" X-Patchwork-Id: 1015375 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-98478-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=3adev.fr Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="SBEhg37o"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43K0Kc2Nkyz9s3Z for ; Wed, 19 Dec 2018 01:10:28 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=o8dUGKw87B85CrJfxDN2C/86pTTkbXk 2G14UpFz8vLuk9blT72V4t1McjYeRbH2UMRYhc2oBAUNTwFhgFTfUELSFiMmbq37 PAnsBN8abNv8GolN73FRAjWr7ow6OssLC6TCps/vdryiAeo/fwz2uxraYFI3Vrto JC6HajRgC/vQ= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=N9JgIB2bO3OBYJtingF8iJoSdEg=; b=SBEhg 37o+tRKi8IQUAnpysNIfG7yvcgh7bYqlG7cLGiULlOYy2bAw5z7Sk/f5DL1pJT48 R+Xgnykj98wsCI743ShGNvxPtXd4LtPMI4+9kCmf1oSk3AsTAYTfMaBHRO5EyMc/ Fass6DjBnOfv9+YI8SaxvmIrhovQS6jjshAjZo= Received: (qmail 9944 invoked by alias); 18 Dec 2018 14:10:07 -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 9779 invoked by uid 89); 18 Dec 2018 14:10:06 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.4 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_NONE autolearn=ham version=3.3.2 spammy= X-HELO: smtp3-g21.free.fr From: "Albert ARIBAUD (3ADEV)" To: libc-alpha@sourceware.org Subject: [PATCH v2 2/5] Y2038: add function __gmtime64 Date: Tue, 18 Dec 2018 15:09:52 +0100 Message-Id: <20181218140955.7910-3-albert.aribaud@3adev.fr> In-Reply-To: <20181218140955.7910-1-albert.aribaud@3adev.fr> References: <20181218140955.7910-1-albert.aribaud@3adev.fr> Tested with 'make check' on x86_64-linux-gnu and i686-linux.gnu. * include/time.h (__gmtime64): Add. * time/gmtime.c (__gmtime64): Add. [__TIMESIZE != 64] (__gmtime): Turn into a wrapper. --- include/time.h | 7 +++++++ time/gmtime.c | 18 ++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/include/time.h b/include/time.h index 876b8a2b5f..c5881acf9f 100644 --- a/include/time.h +++ b/include/time.h @@ -79,6 +79,13 @@ extern struct tm *__gmtime_r (const time_t *__restrict __timer, struct tm *__restrict __tp); libc_hidden_proto (__gmtime_r) +#if __TIMESIZE == 64 +# define __gmtime64 gmtime +#else +extern struct tm *__gmtime64 (const __time64_t *__timer); +libc_hidden_proto (__gmtime64) +#endif + /* Compute the `struct tm' representation of T, offset OFFSET seconds east of UTC, and store year, yday, mon, mday, wday, hour, min, sec into *TP. diff --git a/time/gmtime.c b/time/gmtime.c index bda09bc021..ee901c3ba1 100644 --- a/time/gmtime.c +++ b/time/gmtime.c @@ -28,10 +28,24 @@ __gmtime_r (const time_t *t, struct tm *tp) libc_hidden_def (__gmtime_r) weak_alias (__gmtime_r, gmtime_r) +/* Return the `struct tm' representation of *T in UTC. */ +struct tm * +__gmtime64 (const __time64_t *t) +{ + return __tz_convert (*t, 0, &_tmbuf); +} + +/* Provide a 32-bit variant if needed. */ + +#if __TIMESIZE != 64 + +libc_hidden_def (__gmtime64) -/* Return the `struct tm' representation of *T in UTC. */ struct tm * gmtime (const time_t *t) { - return __tz_convert (*t, 0, &_tmbuf); + __time64_t t64 = *t; + return __gmtime64 (&t64); } + +#endif