From nobody Fri Jul 18 17:50:21 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 4bkHPp0cK8z62Zlg; Fri, 18 Jul 2025 17:50:22 +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 4bkHPn6lCYz3tTc; Fri, 18 Jul 2025 17:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752861021; 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=QU7hiPoGk7aM/v6Yll5U28Xy9NnA0sv/kF3UCtQGUeM=; b=YN+VnP4S103OzIcBtbiPxRECSSPy259cW16d1pyCl9Dw29jhTvIJQfLZ2Xi7H1H1Aeg6Ae Na/V1HN3mnHkSM3+67dbDqM1c5xXNTivMz2d1GywPYIoC5rHb0BVcwWFxVLFmvhCS6nyB6 2fQ1I5iXXNT1JPB5MeGUqBwCEFOtDu8hJYunvdjabw8ZtjtG4gPqfr7cMsPaZ5bLvX34Xk k7c51Q5Z2wZ3Pl3EfULh3MD30+JaFlKUaDHtKxAPpTxY/xFypBBC/WY/q0J6E0bGBp7umc G8xih43wBWf7ctlrqsIKVK8EOC/SNhhro3zPPx6Yuy04px+7yYw3pqBYwRhPhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752861021; 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=QU7hiPoGk7aM/v6Yll5U28Xy9NnA0sv/kF3UCtQGUeM=; b=Z1zrtZf4nTmDqh5XS86MdPZew2+SZb+Ecr+n1i1Lr1N7Z6dFJmwF6ITYGOCU/2nVqARRWh JdBuTrZXakJHsRe2SCg0zheDeLz7dWsVwFo0w3dsxp597Ez/FsRKrIgde0OXPjPB4JJggR rp/tbEQ3flZkkbRZhYdOeSwUi7v72nAjBwdDrQa9AYhP+tLmLA8QjCyeT32DXf8kaHaPHL mBndZYt5IctQPDWh3w7gGp6mquISd2JvzdYLegAiV2V5KGMB8Rs7nicXjlXwmpWqfdsMaS ci+qXqfD+dQX3TeRkBZUWulef6cHym5MhEvjqBQ4nZGHUm/xoa/vuotWI7Q3Hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752861021; a=rsa-sha256; cv=none; b=ozWqxgiLMI8v8RMs3LpLtQIV+KWfW3mRs17IZFSkEPYnhqr512i7pt7F9SVnc/qQ5OSSK0 vkd2411kMHvCad6UQXWIstXEpwS05WZWzLfTUR5/3h5IPe054zeS06dkFIDuxiEvccS4i5 rFQaVOc2ImBhGS2c2NhrUTEEZaPKpCpVB/8kE70B/syWH73bZ4YsGZpyMq7u46t9YvPpum yvgZieTEZNgPSGCVp9fY3roMgFyLsqwz0dROrmqHbnaGiB/xMLAGVJMbFRxlx3WPoaJ4WO 6ULlkAm02LnQ0gS4yUDyop4IzcFWxtclxlj4OYFvZMikTp0uPNJz8+eKR75kIA== 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 4bkHPn6LSrzr6C; Fri, 18 Jul 2025 17:50:21 +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 56IHoL9K040941; Fri, 18 Jul 2025 17:50:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56IHoLIw040938; Fri, 18 Jul 2025 17:50:21 GMT (envelope-from git) Date: Fri, 18 Jul 2025 17:50:21 GMT Message-Id: <202507181750.56IHoLIw040938@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: d63ffdd1ef63 - main - tzcode: Fix time zone change detection. 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: d63ffdd1ef6368407b35d415237b95cc739d8073 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d63ffdd1ef6368407b35d415237b95cc739d8073 commit d63ffdd1ef6368407b35d415237b95cc739d8073 Author: Dag-Erling Smørgrav AuthorDate: 2025-07-18 17:48:59 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-07-18 17:49:34 +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 --- contrib/tzcode/localtime.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/contrib/tzcode/localtime.c b/contrib/tzcode/localtime.c index f5814a43da54..69b5f0183e2c 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,11 @@ 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; } } fid = _open(name, O_RDONLY | O_BINARY);