From patchwork Thu Nov 29 22:10:07 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: 1005682 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-97718-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="Qw9bdOL7"; 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 435Wv20P5Rz9s9m for ; Fri, 30 Nov 2018 09:11:09 +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=jJpC3P4RtrdQ2WvdRPnF/WwVaCQmjT6 eMgIdPuVzJHJwreOyj2VH2DEy/3VZHLH7mwT33OUUE0owBceFF5BucCNOML0c5i2 g0rlFF7/PbHnHLZiQ82FzGH7lxuJ5CbKzHPAGnOAdLqwbQz+I2Cd5ewbJ63vlpKl JJOaSXHzU4Wo= 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=tTh/zcRU34kebLULkhdTal3mwKQ=; b=Qw9bd OL7KjcMz4D2hVslCmXIK+jq1SWcXQ+X0kAWLHK96e89XqaT70Hu9yVl6jwkV0Oq9 7P5kNdYcNj8SAAJgyV+Wum82nSznEi1K1FTx34rtR24lQXO1HDR4+y4foJ3S0O6c Cw53E493bz7/EZJNFNH4yKXBHPbqEd6DIdwVUc= Received: (qmail 27782 invoked by alias); 29 Nov 2018 22:10:22 -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 27652 invoked by uid 89); 29 Nov 2018 22:10:21 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.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_NONE, RCVD_IN_RP_RNBL autolearn=ham version=3.3.2 spammy=385 X-HELO: smtp3-g21.free.fr From: "Albert ARIBAUD (3ADEV)" To: libc-alpha@sourceware.org Subject: [PATCH v2 6/9] Y2038: add function __ctime64 Date: Thu, 29 Nov 2018 23:10:07 +0100 Message-Id: <20181129221010.19589-7-albert.aribaud@3adev.fr> In-Reply-To: <20181129221010.19589-1-albert.aribaud@3adev.fr> References: <20181129221010.19589-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. (ctime): Compile only if __TIMERSIZE != 64. --- include/time.h | 7 +++++++ time/ctime.c | 14 ++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/include/time.h b/include/time.h index 80543e3673..0247146211 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; +/* nis/nis_print.c needs ctime, so even if ctime is not declared here, + we define __ctime64 as ctime so that nis/nis_print.c can get linked + against a function called ctime. */ +#if __TIMESIZE == 64 +# define __ctime64 ctime +#endif + #if __TIMESIZE == 64 # define __localtime64 localtime #else diff --git a/time/ctime.c b/time/ctime.c index 1222614f29..c20059c9a3 100644 --- a/time/ctime.c +++ b/time/ctime.c @@ -19,6 +19,18 @@ /* Return a string as returned by asctime which is the representation of *T in that form. */ +char * +__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 (__localtime64 (t)); +} + +/* Provide a 32-bit variant if needed */ + +#if __TIMESIZE != 64 + char * ctime (const time_t *t) { @@ -26,3 +38,5 @@ ctime (const time_t *t) In particular, ctime and asctime must yield the same pointer. */ return asctime (localtime (t)); } + +#endif