From patchwork Tue Dec 18 14:09:51 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: 1015374 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-98477-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="b5xdWL01"; 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 43K0KS1wGtz9sCh for ; Wed, 19 Dec 2018 01:10:20 +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=Uum3T2A0KDxnf57rw54ybggjdbEk8AP KGCBOY1tKAfTraopbgOggrbNPu+YIV/ky6UiJxqXGGbB9Pu1xRkCs3PZpLQJjTmW gZknkGg65/YLxQtlg4xDNK8eEdhMQTGA0GR0j7p6ittNF5jx1On1LUku7r5d4yIa qTpW4YsXnKdA= 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=/0y0979ZupC+eR7+5cUPHOEuXtc=; b=b5xdW L01BRFawW7IZz4NjjebTkO56JLnZAu1GrLlCDXLHsHgzw2M382XXx4HLz8dFV8bc 3do5W4p1SplbHgarR1U/f0Vi4bp4In8bK4VbCHOItD6vdakqOB1vOdfHP3Su/f2L xBiqTn8c1umSDp6r6xjE79iR9OCYj6rrzWyBpI= Received: (qmail 9795 invoked by alias); 18 Dec 2018 14:10:06 -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 9744 invoked by uid 89); 18 Dec 2018 14:10:05 -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= X-HELO: smtp3-g21.free.fr From: "Albert ARIBAUD (3ADEV)" To: libc-alpha@sourceware.org Subject: [PATCH v2 1/5] Y2038: add function __localtime64_r Date: Tue, 18 Dec 2018 15:09:51 +0100 Message-Id: <20181218140955.7910-2-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 (__localtime64_r): Add. * time/localtime.c (__localtime64_r): Add. [__TIMESIZE != 64] (__localtime_r): Turn into a wrapper. --- include/time.h | 8 ++++++++ time/localtime.c | 17 ++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/include/time.h b/include/time.h index 3bc303a36e..876b8a2b5f 100644 --- a/include/time.h +++ b/include/time.h @@ -67,6 +67,14 @@ libc_hidden_proto (__localtime64) extern struct tm *__localtime_r (const time_t *__timer, struct tm *__tp) attribute_hidden; +#if __TIMESIZE == 64 +# define __localtime64_r __localtime_r +#else +extern struct tm *__localtime64_r (const __time64_t *__timer, + struct tm *__tp); +libc_hidden_proto (__localtime64_r) +#endif + extern struct tm *__gmtime_r (const time_t *__restrict __timer, struct tm *__restrict __tp); libc_hidden_proto (__gmtime_r) diff --git a/time/localtime.c b/time/localtime.c index 96879d4ec0..9367c7082b 100644 --- a/time/localtime.c +++ b/time/localtime.c @@ -25,10 +25,25 @@ struct tm _tmbuf; /* Return the `struct tm' representation of *T in local time, using *TP to store the result. */ struct tm * -__localtime_r (const time_t *t, struct tm *tp) +__localtime64_r (const __time64_t *t, struct tm *tp) { return __tz_convert (*t, 1, tp); } + +/* Provide a 32-bit variant if needed. */ + +#if __TIMESIZE != 64 + +struct tm * +__localtime_r (const time_t *t, struct tm *tp) +{ + __time64_t t64 = *t; + return __localtime64_r (&t64, tp); +} +libc_hidden_def (__localtime64_r) + +#endif + weak_alias (__localtime_r, localtime_r) 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 From patchwork Tue Dec 18 14:09:53 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: 1015377 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-98480-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="Mdz5HQaM"; 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 43K0Kx00fwz9sC7 for ; Wed, 19 Dec 2018 01:10:44 +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=J2ieGMPYfiXnWk9bo3AMwNMT/WNIOWN FMdZzWZl2PraWzCilLoZBz7T/zslYutn+iLGhZsna8q2sM1Br5G51gTFOGr5FYZs JDo4FbSVDFL7HYmmvePVjVBu/znQUZiQ8PU5E+OgRY2TH6ixHkSTnHTaMeyWWe0u q62Z9jV7kj1c= 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=OS7wl7eonKY5hmreza878K7B+/Q=; b=Mdz5H QaM8SsKVH4m8kAd5saEiky6ZPIu2mL+JpH+rB5PtX9QFxdHuwHSfQSyb//I12uH1 Ipct7I9L/lxPaaa5AsJFlCN+R0H5wjcmBeIKY1YYUU/dP5v8viCxBy2ggjifcLGn biE581lu49y6PhyFcoX0Y8IZBAyPLuNwLlbQ98= Received: (qmail 10880 invoked by alias); 18 Dec 2018 14:10:13 -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 10758 invoked by uid 89); 18 Dec 2018 14:10:12 -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=2126 X-HELO: smtp3-g21.free.fr From: "Albert ARIBAUD (3ADEV)" To: libc-alpha@sourceware.org Subject: [PATCH v2 3/5] Y2038: add function __gmtime64_r Date: Tue, 18 Dec 2018 15:09:53 +0100 Message-Id: <20181218140955.7910-4-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_r): Add. * time/gmtime.c (__gmtime64_r): Add. [__TIMESIZE != 64] (__gmtime): Turn into a wrapper. --- include/time.h | 8 ++++++++ time/gmtime.c | 18 +++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/include/time.h b/include/time.h index c5881acf9f..5a37c0ff79 100644 --- a/include/time.h +++ b/include/time.h @@ -86,6 +86,14 @@ extern struct tm *__gmtime64 (const __time64_t *__timer); libc_hidden_proto (__gmtime64) #endif +#if __TIMESIZE == 64 +# define __gmtime64_r __gmtime_r +#else +extern struct tm *__gmtime64_r (const __time64_t *__restrict __timer, + struct tm *__restrict __tp); +libc_hidden_proto(__gmtime64_r); +#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 ee901c3ba1..dff50f012f 100644 --- a/time/gmtime.c +++ b/time/gmtime.c @@ -21,10 +21,26 @@ /* Return the `struct tm' representation of *T in UTC, using *TP to store the result. */ struct tm * -__gmtime_r (const time_t *t, struct tm *tp) +__gmtime64_r (const __time64_t *t, struct tm *tp) { return __tz_convert (*t, 0, tp); } + +/* Provide a 32-bit variant if needed. */ + +#if __TIMESIZE != 64 + +libc_hidden_def (__gmtime64_r) + +struct tm * +__gmtime_r (const time_t *t, struct tm *tp) +{ + __time64_t t64 = *t; + return __gmtime64_r (&t64, tp); +} + +#endif + libc_hidden_def (__gmtime_r) weak_alias (__gmtime_r, gmtime_r) 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 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