From patchwork Tue Dec 18 14:09:55 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: 1015376 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-98479-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="YgxZk84t"; 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 43K0Km6CrCz9s3Z for ; Wed, 19 Dec 2018 01:10:36 +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=p9Grso35U7/5FAdYWROMtb5g9li38PN QTQthCOrA5uWWo7QfpeGTb9k8KJIXjy9AsVrHIIK2QoE1ckCmd6bhmKwuAReYPel Op3+M3hCxGdEDPtz7Oxr/NEJzT6gzNNpPYYvEN6YHE6gxVVx/Bh82oqlzdjsZwZ4 K55HrxN7aw6c= 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=7r3cA9KDDWVQKvuc0eUEi8oVS2s=; b=YgxZk 84tLJC09Y3JUGMCMom1mILEHA4dJIP18VcemIzIW6KsSeOAlrqxAjKxcXdYMlEAt lFu/yTSDc6AzVgABpCH5V4RDN8c1IdMV+eZMESdle/PgPpqL9CNXZfh3JmsrvzCr wNYpv5qKBHcCNNz8CBvlnPQVbEI2tGV8ss2VvE= Received: (qmail 10514 invoked by alias); 18 Dec 2018 14:10:10 -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 10385 invoked by uid 89); 18 Dec 2018 14:10:10 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 spammy=2223 X-HELO: smtp3-g21.free.fr From: "Albert ARIBAUD (3ADEV)" To: libc-alpha@sourceware.org Subject: [PATCH v2 5/5] Y2038: add function __ctime64_r Date: Tue, 18 Dec 2018 15:09:55 +0100 Message-Id: <20181218140955.7910-6-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_r): Add. * time/ctime_r.c (__ctime64_r): Add. [__TIMESIZE != 64] (__ctime_r): Turn into a wrapper. --- include/time.h | 8 ++++++++ time/ctime_r.c | 19 +++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/include/time.h b/include/time.h index 1f7d175ca6..7c34485f5a 100644 --- a/include/time.h +++ b/include/time.h @@ -64,6 +64,14 @@ extern char *__ctime64 (const __time64_t *__timer) __THROW; libc_hidden_proto(__ctime64); #endif +#if __TIMESIZE == 64 +# define __ctime64_r ctime_r +#else +extern char *__ctime64_r (const __time64_t *__restrict __timer, + char *__restrict __buf) __THROW; +libc_hidden_proto(__ctime64_r); +#endif + #if __TIMESIZE == 64 # define __localtime64 localtime #else diff --git a/time/ctime_r.c b/time/ctime_r.c index c111146d76..7795c3fcca 100644 --- a/time/ctime_r.c +++ b/time/ctime_r.c @@ -22,8 +22,23 @@ /* Return a string as returned by asctime which is the representation of *T in that form. Reentrant version. */ char * -ctime_r (const time_t *t, char *buf) +__ctime64_r (const __time64_t *t, char *buf) { struct tm tm; - return __asctime_r (__localtime_r (t, &tm), buf); + return __asctime_r (__localtime64_r (t, &tm), buf); +} + +/* Provide a 32-bit variant if needed. */ + +#if __TIMESIZE != 64 + +libc_hidden_def(__ctime64_r); + +char * +ctime_r (const time_t *t, char *buf) +{ + __time64_t t64 = *t; + return __ctime64_r (&t64, buf); } + +#endif