From nobody Thu Jul 24 13:03:00 2025 X-Original-To: dev-commits-src-branches@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 4bnrlS57SQz62VLL; Thu, 24 Jul 2025 13:03:00 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bnrlS2rCSz3TrN; Thu, 24 Jul 2025 13:03:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753362180; 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=tKONXw9Y8a/KbMhAqiqo9W4Ep+CZ69Eime6NxkVilVY=; b=eFbC6+KIOKCM34XcpRQ5s7DjsCp73mgcXb6lMLUUxDogSdD7mqOURejAS5I5yxcqxYGkIs 8j9f8HRVHQzGXdTb3LuqVkf/KbyqFB4R1ww7bU3/hQzsXtHOIsShGeY/QMynczucmKb2b4 F7ipGjAAdTzn+aXx/gsQ69LzsbLR/X1pKyGPmNYQSIy69hvyTniv67cTcYhnTZ0DrclMnT 6hBxQDdKG6Q5xbUWlth8nTP5CVP0D5C68R9cLVZGtIeIL8Dz2X23hi9jQLhl7B3xlcq0qo BsLPdIE46Jw0/IKYRouJzmj2hx1iRtQX0yD31IXf2trsHp64PpewA2mKXKltHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753362180; 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=tKONXw9Y8a/KbMhAqiqo9W4Ep+CZ69Eime6NxkVilVY=; b=TQ2jbUGPCnyIdrGMXC1MB10m4/JWU1v5MP/3ETn7vOknhT/sH8B+oK3n8+7sO9yfPrzxZh UuBpExcr1py60uo+xu5bmP+Bfbqu9FG6sALEImAsFN4caIP2gmVd+mcD7oBtwhcHFHj3u8 Pn82jkrEOsHwnibUFDppLY80pVQS/nLXtemKAkYACr5gwuIJ0QMwhBvGdUwEq/ciZQDc6X gAhrMO1gK8B9yukwWuITvKnX9uKu6NIJF4B/zBsh3e2JGqylbcvQKOegfvVJLtt3SvPHY3 +U0Bp2fU2kCU7/ncUKVyTMSEIwYE9Fy7DKqQ6pg6Vyg9FlNK0JRm2L/N6NftpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753362180; a=rsa-sha256; cv=none; b=BuxwXTA7ma7tqKKA5dHB/6FAO6JGdlrjh/wZYC46EpsCDm4n17jrJM9DC1kl8Jh6ObOdvv KF5ApMFewt3KcK6q1pdpcyqejFKbD6VkF8dKIXvo12OlY+l9Bsxvi5ODCWdoTvJITZBl3y dzYve4yIqXadR1bgtdAng26GygfGL4bDabqEKmVL2WFulXto/Ae1AWAeJrSBiTulT5FfXm skTE43liSct6WfU9l/N+tsVbIda5Tmb5/dAAP/wbTN25iYAgJl4MC1aY7ndpk9cCRKXO6K fRUHJ5aeKHBnHK/MaNZEuUNr7eVsNGK/6rZpAJx4rhi8FRM2dsMiZwKrT4KgzQ== 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 4bnrlS2NQZz10cG; Thu, 24 Jul 2025 13:03:00 +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 56OD30kB002052; Thu, 24 Jul 2025 13:03:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56OD30sv002049; Thu, 24 Jul 2025 13:03:00 GMT (envelope-from git) Date: Thu, 24 Jul 2025 13:03:00 GMT Message-Id: <202507241303.56OD30sv002049@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 6a21ccee94ee - stable/14 - tzcode: Fix time zone change detection. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: 6a21ccee94eefc22692b9aa267a27f4776f775f9 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=6a21ccee94eefc22692b9aa267a27f4776f775f9 commit 6a21ccee94eefc22692b9aa267a27f4776f775f9 Author: Dag-Erling Smørgrav AuthorDate: 2025-07-18 17:48:59 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-07-24 13:02:45 +0000 tzcode: Fix time zone change detection. Prior to the 2022g import, tzloadbody() returned -1 on error. Now it returns an errno code. When I updated the time zone change detection logic to match, I improperly returned errno in all cases, which means that if the time zone file has not changed since we last loaded it, tzloadbody() returns a random errno value instead of 0. Fixes: bc42155199b5 MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D51405 (cherry picked from commit d63ffdd1ef6368407b35d415237b95cc739d8073) tzcode: Add an explicit "the timezone file has changed" case This is required for the WITHOUT_DETECT_TZ_CHANGES case, since there the value being tested is a numeric literal. Fixes: d63ffdd1ef63 ("tzcode: Fix time zone change detection.") (cherry picked from commit 0bf113e9041fe20e8c671fe6b2cca8612dc77b77) --- contrib/tzcode/localtime.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/contrib/tzcode/localtime.c b/contrib/tzcode/localtime.c index f5814a43da54..bdec08e4abae 100644 --- a/contrib/tzcode/localtime.c +++ b/contrib/tzcode/localtime.c @@ -408,10 +408,8 @@ change_in_tz(const char *name) static char old_name[PATH_MAX]; static struct stat old_sb; struct stat sb; - int error; - error = stat(name, &sb); - if (error != 0) + if (stat(name, &sb) != 0) return -1; if (strcmp(name, old_name) != 0) { @@ -510,13 +508,13 @@ tzloadbody(char const *name, struct state *sp, bool doextend, * 'doextend' to ignore TZDEFRULES; the change_in_tz() * function can only keep state for a single file. */ - int ret = change_in_tz(name); - if (ret <= 0) { - /* - * Returns an errno value if there was an error, - * and 0 if the timezone had not changed. - */ + switch (change_in_tz(name)) { + case -1: return errno; + case 0: + return 0; + case 1: + break; } } fid = _open(name, O_RDONLY | O_BINARY);