From patchwork Tue Dec 18 14:09:54 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: 1015378 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-98481-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="rlAjE26H"; 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 43K0L55nMFz9s3Z for ; Wed, 19 Dec 2018 01:10:53 +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=mgkdQEIcmpz1zoz/0TvBlAP5zwzHoPQ HIkBdKvSdiTb08pcUd0SpxyKWHsCMIVQIgQm1MzU73XNDKeqr2QEK8xpBxWXCrxs /0WO+kj/6UoflE9+4g+3N950uh1LujKwVeY6XJgzDRbRGpG/kzIg/cySNTKkkpXT k7nuIt21Qkxs= 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=QdJYkVDZQW187pFti673Nw9gMS8=; b=rlAjE 26HFMoWIgrLsZpVdYMV75fW/mA9ffjs/pVY90jyytFdRRGVSfBkG1/ncAfF8iidU PNGeD3Wja+boosYxB0bpsCQJPEy2X0Ez/zFTlhHID67sBnckmOvgB5pPAkVtjzmk 4kN7Ly6qZhDXIC8zxrNZ15o7OFujyAl/Kb36SM= Received: (qmail 11101 invoked by alias); 18 Dec 2018 14:10:14 -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 10983 invoked by uid 89); 18 Dec 2018 14:10:13 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.1 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 autolearn=ham version=3.3.2 spammy=Hx-languages-length:1532 X-HELO: smtpfb1-g21.free.fr From: "Albert ARIBAUD (3ADEV)" To: libc-alpha@sourceware.org Subject: [PATCH v2 4/5] Y2038: add function __ctime64 Date: Tue, 18 Dec 2018 15:09:54 +0100 Message-Id: <20181218140955.7910-5-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 (__ctime64): Add. * time/gmtime.c (__ctime64): Add. [__TIMESIZE != 64] (ctime): Turn into a wrapper. --- include/time.h | 7 +++++++ time/ctime.c | 19 +++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/include/time.h b/include/time.h index 5a37c0ff79..1f7d175ca6 100644 --- a/include/time.h +++ b/include/time.h @@ -57,6 +57,13 @@ 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; +libc_hidden_proto(__ctime64); +#endif + #if __TIMESIZE == 64 # define __localtime64 localtime #else diff --git a/time/ctime.c b/time/ctime.c index 1222614f29..43a39e3f3b 100644 --- a/time/ctime.c +++ b/time/ctime.c @@ -20,9 +20,24 @@ /* 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 + +libc_hidden_def(__ctime64); + +char * +ctime (const time_t *t) +{ + __time64_t t64 = *t; + return __ctime64 (&t64); } + +#endif