From nobody Tue Sep 23 12:59:09 2025 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 4cWKmt4ZcFz68cdT; Tue, 23 Sep 2025 12:59:10 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cWKmt13BRz3W9S; Tue, 23 Sep 2025 12:59:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758632350; 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=8E9ZR0I8Vfd4lrcp4B0Zw+gFaCC9egA1tgdSykrulzs=; b=w67tPWGRH+anNwSbe8XJ9A5bWd62NswxohMLpwummkKsHxDtVEj8rZ/Jx4NeJsz6FQoaXE AbVcGs+DAJRY4jFmjcLS7gWeayeKm1JT1ww8V/piJiLmw20oGi5QxwizfYVgYojqpHcpjN w0YCigxN56AGEbvX8yrEAcK7ejDyPPp+y/Jqf4T6o+Tr55R0uKHyL9HisC/iT56+/AX9pP FtM9kuCw06jKkecZUvAsVQjuKKIw0s223sSpR2acJ4H8uz+GQ6vvaLhca/LUPDbsUuJqaT PLrE/nldtn27Nn/C6jD9mCFCCoflzjgbl52+W8vrTP271QkR+mSCuYY7Jc0B2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758632350; 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=8E9ZR0I8Vfd4lrcp4B0Zw+gFaCC9egA1tgdSykrulzs=; b=ff+KFjqtlw1NapLnD4lJEDSicPN2oEhSsuqA5sCfMVEcTWJ7ahN1/6vtcBJB3ZDT3q2aoZ krLrVmza/aIMIWtMof8r4UVrypUS8sISgjAxo4x/WeV8UxaQzSofts6zP6IH7Op1znBSrZ D+vJMk61ZkRtzdlhgDrm3SVK3YeQ7+v5t10eO4MUY7KEOoB+9duSfilp3WHWl5Kqno5uDq +suqsVarA7zuJ3zywfZ6Vhy/CVJZJgdOamTAzf6itknc3gIWOHQdrUvKGc7uri8auFjEOn 4zVHMwmkV5QdNVueNDOpY+JnxLOiUnZFGDIFAQFg/BKOI3Bo2UlqTe15uiB+BA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758632350; a=rsa-sha256; cv=none; b=vtmDL+8h/8/LhyMDZXNEI7DBHFC71SQQ/p0Llh5ncS4CaFcRr6wxk9XRtwep3NQvQ2w3KG lv4Cwml8qGfb6uohphMJvBWumZZbCcf2fMkYk6b1W0zdDGNPvq6gRRirAvj1+EMX1jW7Hu XIW1dnDsuOo6jfXi67vs4GvuoW7v+aJfcJlebeCG4LI5gNgU8w/lyMB8gJPp1+q6wAFh9f tw5LkHh4dAs3YzJ6fowvkGH4ChwQd+h/aBPJauulSyMrepagWVsz6yA+D40UKPiqQRnKY0 OBTivduV8zz/iVQm7cdDGAD1SDFY7FTCuHMDPYWz3r3r+iZdLDIx5oRP1xK3HA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cWKms6VJRzmm8; Tue, 23 Sep 2025 12:59:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58NCx9fc004860; Tue, 23 Sep 2025 12:59:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58NCx9p6004857; Tue, 23 Sep 2025 12:59:09 GMT (envelope-from git) Date: Tue, 23 Sep 2025 12:59:09 GMT Message-Id: <202509231259.58NCx9p6004857@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: a5f14e4f9069 - main - tzcode: Use -00 only for invalid time zones 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: a5f14e4f9069a8ffed66d923bb0ecf20d8a0e6af Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a5f14e4f9069a8ffed66d923bb0ecf20d8a0e6af commit a5f14e4f9069a8ffed66d923bb0ecf20d8a0e6af Author: Dag-Erling Smørgrav AuthorDate: 2025-09-23 12:56:11 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-09-23 12:56:11 +0000 tzcode: Use -00 only for invalid time zones As of tzcode 2025a, if we are unable to load a time zone, we set tzname to "-00" to indicate an error. This penalizes users who simply don't set TZ or create /etc/localtime as a faster way of setting the time zone to UTC (pointing /etc/localtime at /usr/share/zoneinfo/UTC forces us to parse it every time for no real benefit). To rectify this, use "-00" only if TZ was set or zoneinit() returned something else than ENOENT. MFC after: 3 days Fixes: 967a49a21a27 ("Update tzcode to 2025b") Reviewed by: philip Differential Revision: https://reviews.freebsd.org/D52680 --- contrib/tzcode/localtime.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/contrib/tzcode/localtime.c b/contrib/tzcode/localtime.c index 15afeeecb6d0..7ba72d730648 100644 --- a/contrib/tzcode/localtime.c +++ b/contrib/tzcode/localtime.c @@ -1649,9 +1649,13 @@ tzset_unlocked_name(char const *name) lclptr = sp = malloc(sizeof *lclptr); # endif if (sp) { - if (zoneinit(sp, name, TZLOAD_FROMENV | TZLOAD_TZSTRING) != 0) { + int err = zoneinit(sp, name, TZLOAD_FROMENV | TZLOAD_TZSTRING); + if (err != 0) { zoneinit(sp, "", 0); - strcpy(sp->chars, UNSPEC); + /* Abbreviate with "-00" if there was an error. + Do not treat a missing TZDEFAULT file as an error. */ + if (name || err != ENOENT) + strcpy(sp->chars, UNSPEC); } if (0 < lcl) strcpy(lcl_TZname, name);