From nobody Thu Feb 9 18:38:12 2023 X-Original-To: dev-commits-src-main@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 4PCQbm5FJMz3n5xv; Thu, 9 Feb 2023 18:38:12 +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 4PCQbm4bZSz3JMZ; Thu, 9 Feb 2023 18:38:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675967892; 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=FzQuSilkz8Jl/+kfiuayo0GBeJfNmX0m/S3hk887HRQ=; b=THIOQ0lx4SFjeYdJduZhJYahNbGIa4RKYzxYGukgD/hZB6qIChnivTaRifUjly4hwx2MiF nlOZyr7fBB64Oz22WYyXlXBE5H85VExWNECoJNrdaZ3EKil/v7zZKYX05Fb03cFbVd+Uoj Fsexjyi0jXnckBK8DsRtqN5dUySKT68QKOzLDXdXyjL2xxYbSPsiSsaoiOiOlttOpMBvvO 2TEhEq/ZhBRpG044osy6He/L6bLmIAGMI7P7vIlQaNeBGvmmEu66V8j/ts9k36PtHXrn+B Yi7F+f/g1sUdUiRb0BPlzAGINdSDgupEtsWPihQ8vLLpcmdvwAdkO/Yd/4P0WA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675967892; 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=FzQuSilkz8Jl/+kfiuayo0GBeJfNmX0m/S3hk887HRQ=; b=x76HiAdNgs6ED21iZf1k/bPjZR4sW+hSHe1JUy1OVSNSa34lXNlrKJvlMgkkZT2Y6csYRn mYs/PR3kRnlmmne7Ybns9Be7dGYZhd0x/f7gLAV8UkZz4Hj0kG1dM1fv/3UqFjWEaSl66E 0+nSKft3/DScOJ3ZqYYgtmy+6rv6ogL7ekqin7TUvZmDC0Kk+6zB3f22M6hslPT65GRYfu aPhP2ib014nc2VmcQR9F3gy9df2fgIN/8LMnK1jzOxU8AeqHpYh+Tg4YTiK2BgAMVeJZMR cFTsHqFZwo/ssPy2FelPxeiCHfA/imsW/0h/4ex1SxFTc135GJSYuQx5aon2mQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675967892; a=rsa-sha256; cv=none; b=BX9auTMjKV0xvqIZDvSkTlWUCrR/Ss55kpWS2WYSlHlLBK29Zye4N7cXzM52O6qdhwPJBy uRkz3LmD1mFeedDBLcwOVLZOmKhTzEVS51oN9ChMLqlRNFoXuT27HJPzv0Y5doUm/kCsgn qYQ6OsskIhqWegF20WdXodbDT3B0udGk638mj9x6QhVClkberLLtNRJmaclHdNAdjcFIlm 1lmAzU7bEQqZ1Bk2uHF41eohl9Bmrsl5o6vQRERmRqmVpA3X7WMmgD2YQPR7h+nwZ4J88Z sRC0t7BGXJPS0OOot3GNReiK8EhLIay3ITy4yxy3O6XXMOWYuHSPe0OHvYbERw== 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 4PCQbm3DSQznZR; Thu, 9 Feb 2023 18:38:12 +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 319IcCMx012249; Thu, 9 Feb 2023 18:38:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 319IcCuW012248; Thu, 9 Feb 2023 18:38:12 GMT (envelope-from git) Date: Thu, 9 Feb 2023 18:38:12 GMT Message-Id: <202302091838.319IcCuW012248@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 71e0c8906e1a - main - tzcode: Resurrect tzsetwall(3) with a deprecation warning. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 71e0c8906e1a4ff774f8ae810aeb94af039eedb7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=71e0c8906e1a4ff774f8ae810aeb94af039eedb7 commit 71e0c8906e1a4ff774f8ae810aeb94af039eedb7 Author: Dag-Erling Smørgrav AuthorDate: 2023-02-09 18:35:34 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-02-09 18:35:34 +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 --- 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