From nobody Mon Feb 13 13:59:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PFmDH6CT7z3r76p; Mon, 13 Feb 2023 13:59:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PFmDH5h52z4CQH; Mon, 13 Feb 2023 13:59:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676296767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5SNOR1Lb0mq7gmuChHK0pDauK4D4DdGeL38+a25efBc=; b=n2f6DvGmej2pJTARUIl1G6+LWIAm9Ou3okO7QXnOiCLQ/+T4a7aWXZx442rN8O1HvGfSIT 4Tf/L2fqoqzUYtuYtTvO0iiw7shIPtw/DG7UNwOSTtTyPuq95nmeNJWnOSkibEvunVZt/D 3bszihwmegT9qJl7Brjk0WrtKeHM3AuaTfjegwwnvzJX259dm9DFOYZ9cNCAbaxWogwaE2 dkHN06rAc8KYTxw7MqSaDcxIyD4dkY14Xp6alv7CRz2ultT1C5ZpkkgvMmjDBOSeUstUU+ dfoKZ/GYXsMPvvBiFZt8gRj7VcgzjaghlNOlcdj4RtCK8UKqYYFmTWfTlvppEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676296767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5SNOR1Lb0mq7gmuChHK0pDauK4D4DdGeL38+a25efBc=; b=hjODj9GDGw3+Q9evAa5H1Fua7jxBttklsir4FJrdoGd38qivr3d/CoF4sJetHjwFZ6Z4Qr x8TYvGqlP0eT1CcZwM0Q+beNLjoL18/cs/yyhvEZw2ojBjGY4Pay0kazeQOBSaPilOwoYk WCN8XFlKlwquAeHjJQA+xxwv3EYLNQ7nDgfY0uEoVjAY5DU4xRCM/+4xryrzLxJ+LaAftr VNdpnWCfceln9MzvnKR3Le2YnUb1L9LL5hwY1sWXTcLOEuK740rXFZ1XORIHuyk+K5GRTs 4P2HOo/d8pwalJLvcFCjE8TXwSt87Ffn7K2ZDpFScNxBmB2+KwzKhdtEVN/qug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676296767; a=rsa-sha256; cv=none; b=EiV5+euLjp7FWBy3z2L7aRjeI5C++O6k3j1ETjUjyGWhFcdhvwJeugeC6qMbxU4/zNy/qq 9GFJMRY3zBWxBalIX00BQpgQHJmxMRzXBjC3s/39jx/iakumgmAI4ySQnXOe77RuXTxesG VXyF/xtrMHw827LmKjnL8CvdUa9QAGYnFkaFGy/PIuxQ2i4ooHQdSXaG2P/A+Up6YNMR+T rUjqzNRunTvSiBG0AZk6DfSfCT8M0OM6VsoR2Y6vsnspT08f0IXBQHOIEf/3OEzInBcKdh hm7l2ETaqgW/1bOofqNdOQSIs9XdnUmSKUctnbm28GRlUSadZ4yGzJqi6U7yHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PFmDH4SSLzLLN; Mon, 13 Feb 2023 13:59:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31DDxRsR038299; Mon, 13 Feb 2023 13:59:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31DDxRbx038298; Mon, 13 Feb 2023 13:59:27 GMT (envelope-from git) Date: Mon, 13 Feb 2023 13:59:27 GMT Message-Id: <202302131359.31DDxRbx038298@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: eab9ed3d48e0 - stable/13 - tzcode: Resurrect tzsetwall(3) with a deprecation warning. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: eab9ed3d48e0842f3114d8582a4c2868a354190b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=eab9ed3d48e0842f3114d8582a4c2868a354190b commit eab9ed3d48e0842f3114d8582a4c2868a354190b Author: Dag-Erling Smørgrav AuthorDate: 2023-02-09 18:35:34 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-02-13 13:58:41 +0000 tzcode: Resurrect tzsetwall(3) with a deprecation warning. This function has been around since 4.4BSD but was dropped upstream in 2020. This went unnoticed when tzcode was updated. Bring it back, but prepare for removing it before 14.0 is released. PR: 269445 MFC after: 3 days Reported by: val@packett.cool Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D38445 (cherry picked from commit 71e0c8906e1a4ff774f8ae810aeb94af039eedb7) --- contrib/tzcode/localtime.c | 21 +++++++++++++++++++-- lib/libc/gen/tzset.3 | 14 +++++++++----- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/contrib/tzcode/localtime.c b/contrib/tzcode/localtime.c index 1b52e26a5faf..a8beaf47319a 100644 --- a/contrib/tzcode/localtime.c +++ b/contrib/tzcode/localtime.c @@ -1517,9 +1517,8 @@ zoneinit(struct state *sp, char const *name) } static void -tzset_unlocked(void) +tzset_unlocked_name(char const *name) { - char const *name = getenv("TZ"); struct state *sp = lclptr; int lcl = name ? strlen(name) < sizeof lcl_TZname : -1; if (lcl < 0 @@ -1541,6 +1540,12 @@ tzset_unlocked(void) lcl_is_set = lcl; } +static void +tzset_unlocked(void) +{ + tzset_unlocked_name(getenv("TZ")); +} + void tzset(void) { @@ -1550,6 +1555,18 @@ tzset(void) unlock(); } +void +freebsd13_tzsetwall(void) +{ + if (lock() != 0) + return; + tzset_unlocked_name(NULL); + unlock(); +} +__sym_compat(tzsetwall, freebsd13_tzsetwall, FBSD_1.0); +__warn_references(tzsetwall, + "warning: tzsetwall() is deprecated, use tzset() instead."); + static void gmtcheck(void) { diff --git a/lib/libc/gen/tzset.3 b/lib/libc/gen/tzset.3 index ddeb40585f33..788a6259b727 100644 --- a/lib/libc/gen/tzset.3 +++ b/lib/libc/gen/tzset.3 @@ -31,7 +31,7 @@ .\" @(#)tzset.3 8.2 (Berkeley) 11/17/93 .\" $FreeBSD$ .\" -.Dd November 17, 1993 +.Dd February 8, 2023 .Dt TZSET 3 .Os .Sh NAME @@ -102,10 +102,14 @@ is used. .Pp The .Fn tzsetwall -function -sets things up so that -.Xr localtime 3 -returns the best available approximation of local wall clock time. +function is equivalent to calling +.Fn tzset +with the +.Ev TZ +environment variable unset. +It is deprecated and may not be available in +.Fx 14.0 +and later. .Sh SPECIFICATION FORMAT When .Ev TZ