From owner-dev-commits-src-all@freebsd.org Tue Sep 14 18:56:45 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2BDAA66EC55; Tue, 14 Sep 2021 18:56:45 +0000 (UTC) (envelope-from etnapierala@gmail.com) Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H8CHw3lSZz4Wk9; Tue, 14 Sep 2021 18:56:44 +0000 (UTC) (envelope-from etnapierala@gmail.com) Received: by mail-wm1-x332.google.com with SMTP id c8-20020a7bc008000000b002e6e462e95fso2938815wmb.2; Tue, 14 Sep 2021 11:56:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=28JPq7X2OaarKyHP4zBBkeheqDsbh7iPF4faibRQIv0=; b=Nhhqoh574cX40tZoEMlUHC9vpt0uwyOUUHtAat+Y3b5kqt7RlJR/Ix1/avGXmGMV7U zs3kZzAy9rrw2rgGD7uZR/XAE2l3ZQgjkNqK0iDR64QhOibKFIXcUEWA5tu2crCZWmVD /zFq1fG+BOqHQl5lr9btSLsM8Owo4vb8lqiTkZmomty4YAgge8WfoIaQXWgXdfnN5qnZ 7sQRXHSpceuRQ0gzVBHSLkKqgdVglRXl70bsOLzoAZmksknhvNT+mK1biQQ1qFWtun97 0iW0b+Rip0KP3aDKJ94h2QJRvIlxqGK2dgrV4POqW2ba0hfH6DDxRva0IXChYz0usEpc NFNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:mime-version:subject:from:in-reply-to :date:cc:content-transfer-encoding:message-id:references:to; bh=28JPq7X2OaarKyHP4zBBkeheqDsbh7iPF4faibRQIv0=; b=bL78VYx/XoVRJE3Nv/JWl/VM554/hKgt8TB8vCP5eHSQb/d/Xkf4m9toD/FJSfjQoR hJuk9L08FG8jAN4vLEmaH4bIIN/WKB9TX0n0OH2Ox5Xysu68FrdmG7DQC2/yhN/IttBW zW5bnxGE+xGprWEmKiYb/PirLMggteO/RgxbMoUGjKNkglMOLWknuMxLmg/iOa+HA4ha 40oAzlm0HuhbyGndFr/VaQ7K3n2txzi3waq1ZwnbDeU2y0If7ONOIZueUo1sesULxFpE CrHP2IFS+NEV7L2w+TuCAbQ+jGZnhIuPKwoMvl4+Cl0i9eYop+UjQOmreyIvejMNJTil XKHg== X-Gm-Message-State: AOAM533SBRcLACED3W23F3VXlsqRlf4qyvcEz1+LJy9G0caN+CTkISjO 58mAZcM1rF6FldHGgTRTD8FX/i1BkQk= X-Google-Smtp-Source: ABdhPJzbs/0tD46Cy1rK0utfbrsKjCs3wM6hlDlDCrPWV7/7Vwhu54HYHH1OqM0Md8xGot6grcCGkA== X-Received: by 2002:a05:600c:b56:: with SMTP id k22mr585239wmr.92.1631645803542; Tue, 14 Sep 2021 11:56:43 -0700 (PDT) Received: from smtpclient.apple (cpc159423-cmbg20-2-0-cust338.5-4.cable.virginm.net. [86.7.147.83]) by smtp.gmail.com with ESMTPSA id i2sm7074632wrq.78.2021.09.14.11.56.42 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Sep 2021 11:56:43 -0700 (PDT) Sender: =?UTF-8?Q?Edward_Tomasz_Napiera=C5=82a?= Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.120.0.1.13\)) Subject: Re: git: ddedf2a11eb2 - main - tzcode: Implement timezone change detection From: Edward Napierala In-Reply-To: <59a39614-45d2-d9b0-a84a-476e52a81c76@FreeBSD.org> Date: Tue, 14 Sep 2021 19:56:42 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202109131442.18DEgDIn043709@gitrepo.freebsd.org> <59a39614-45d2-d9b0-a84a-476e52a81c76@FreeBSD.org> To: Bryan Drewery X-Mailer: Apple Mail (2.3654.120.0.1.13) X-Rspamd-Queue-Id: 4H8CHw3lSZz4Wk9 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20210112 header.b=Nhhqoh57; dmarc=none; spf=pass (mx1.freebsd.org: domain of etnapierala@gmail.com designates 2a00:1450:4864:20::332 as permitted sender) smtp.mailfrom=etnapierala@gmail.com X-Spamd-Result: default: False [-2.70 / 15.00]; TO_DN_EQ_ADDR_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36:c]; MV_CASE(0.50)[]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FORGED_SENDER(0.30)[trasz@freebsd.org,etnapierala@gmail.com]; RECEIVED_SPAMHAUS_PBL(0.00)[86.7.147.83:received]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; MID_RHS_MATCH_FROM(0.00)[]; FROM_NEQ_ENVFROM(0.00)[trasz@freebsd.org,etnapierala@gmail.com]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20210112]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::332:from]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[dev-commits-src-all,dev-commits-src-main] X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Sep 2021 18:56:45 -0000 > On 14 Sep 2021, at 17:39, Bryan Drewery wrote: >=20 > On 9/13/2021 7:42 AM, Edward Tomasz Napierala wrote: >> +#else /* !DETECT_TZ_CHANGES */ >> +#define change_in_tz(X) 0 >=20 > WITHOUT_DETECT_TZ_CHANGES: change_in_tz() =3D=3D 0 >=20 >> +#endif /* !DETECT_TZ_CHANGES */ >> + >> static int >> differ_by_repeat(const time_t t1, const time_t t0) >> { >> @@ -379,6 +418,7 @@ register const int doextend; >> int stored; >> int nread; >> int res; >> + int ret; >> union { >> struct tzhead tzhead; >> char buf[2 * sizeof(struct tzhead) + >> @@ -427,6 +467,22 @@ register const int doextend; >> (void) strcat(fullname, name); >> name =3D fullname; >> } >> + if (doextend =3D=3D TRUE) { >> + /* >> + * Detect if the timezone file has changed. = Check >> + * 'doextend' to ignore TZDEFRULES; the = change_in_tz() >> + * function can only keep state for a single = file. >> + */ >> + ret =3D change_in_tz(name); >> + if (ret <=3D 0) { >=20 > WITHOUT_DETECT_TZ_CHANGES: Always returns a false-positive "done" but > short-circuits the rest of tzload(). >=20 >> + /* >> + * Returns -1 if there was an error, >> + * and 0 if the timezone had not = changed. >> + */ >> + free(fullname); >> + return ret; >> + } >> + } Thanks! No idea how I could miss this. Does = https://reviews.freebsd.org/D31961 look reasonable?