From patchwork Mon Dec 17 22:04:28 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: 1014780 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-98423-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="NcioAYCo"; 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 43JZvt1lqSz9s7W for ; Tue, 18 Dec 2018 09:05:14 +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=OLZT5xkJNoUcOogkgJ61/GA8TE333hx /N3JjneanQUWw7P2CeJz+6qui9NMUJozWZAojHxRf+BkFGrli/LUSGTC0Ydtdwwn qb8R5Cqe6eGn09nBpfMSCUQM/nGK28cwYhwZDx4DUKxiZgOyATtLgmMQlC2AjEN4 PK04pGou9wj0= 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=EGvsyFOwD7YFoAtPCHwmPnWL2yY=; b=NcioA YCov7zeKQIqMqcwFiKO4hww172vW7KzGUAvLOVM5vcLdKekyA+QZdS1i25AS0HQ/ E84UH9O1ARUDRzd9tD8oMe6SU0p8iMFs1cZW1kLZ520b/MvQyyXpgturbEVFI2zM vGRqMegaw+Dff27Rn9f8dZ9MlWIhGvi3/aCTQw= Received: (qmail 33115 invoked by alias); 17 Dec 2018 22:04:39 -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 32959 invoked by uid 89); 17 Dec 2018 22:04:38 -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=Hx-languages-length:1463 X-HELO: smtp3-g21.free.fr From: "Albert ARIBAUD (3ADEV)" To: libc-alpha@sourceware.org Subject: [PATCH 4/5] Y2038: add function __ctime64 Date: Mon, 17 Dec 2018 23:04:28 +0100 Message-Id: <20181217220429.4599-5-albert.aribaud@3adev.fr> In-Reply-To: <20181217220429.4599-1-albert.aribaud@3adev.fr> References: <20181217220429.4599-1-albert.aribaud@3adev.fr> Tested with 'make check' on x86_64-linux-gnu and i686-linux.gnu. * include/time.h (__ctime64): Add. * time/gmtime.c (__ctime64): Add. [__TIMESIZE != 64] (ctime): Turn into a wrapper. --- include/time.h | 6 ++++++ time/ctime.c | 17 +++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/include/time.h b/include/time.h index 80543e3673..dce17b1a71 100644 --- a/include/time.h +++ b/include/time.h @@ -57,6 +57,12 @@ extern time_t __mktime_internal (struct tm *__tp, struct tm *), long int *__offset) attribute_hidden; +#if __TIMESIZE == 64 +# define __ctime64 ctime +#else +extern char *__ctime64 (const __time64_t *__timer) __THROW; +#endif + #if __TIMESIZE == 64 # define __localtime64 localtime #else diff --git a/time/ctime.c b/time/ctime.c index 1222614f29..9c51430a37 100644 --- a/time/ctime.c +++ b/time/ctime.c @@ -20,9 +20,22 @@ /* Return a string as returned by asctime which is the representation of *T in that form. */ char * -ctime (const time_t *t) +__ctime64 (const __time64_t *t) { /* The C Standard says ctime (t) is equivalent to asctime (localtime (t)). In particular, ctime and asctime must yield the same pointer. */ - return asctime (localtime (t)); + return asctime (__localtime64 (t)); } + +/* Provide a 32-bit variant if needed */ + +#if __TIMESIZE != 64 + +char * +ctime (const time_t *t) +{ + __time64_t t64 = *t; + return __ctime64 (&t64); +} + +#endif