From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 3CC8F60B2A for ; Thu, 3 Sep 2020 13:40:06 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 21ACE185AD for ; Thu, 3 Sep 2020 13:40:06 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 87AB91854B for ; Thu, 3 Sep 2020 13:40:02 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 554A3449F2 for ; Thu, 3 Sep 2020 13:40:02 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Thu, 3 Sep 2020 13:39:58 +0200 Message-Id: <20200903114000.6932-9-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200903114000.6932-1-d.csapak@proxmox.com> References: <20200903114000.6932-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.087 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Subject: [pbs-devel] [PATCH proxmox-backup 08/10] tools/systemd/tm_editor: remove conversion of the year X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 11:40:06 -0000 the tm struct contains the year - 1900 but we added that if we want to use the libc normalization correctly, the tm struct must have the correct year in it, else the computations for timezones, etc. fail instead add a getter that adds the years and a setter that subtracts it again Signed-off-by: Dominik Csapak --- src/tools/systemd/tm_editor.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/tools/systemd/tm_editor.rs b/src/tools/systemd/tm_editor.rs index a1cf2464..529e17f6 100644 --- a/src/tools/systemd/tm_editor.rs +++ b/src/tools/systemd/tm_editor.rs @@ -25,13 +25,11 @@ pub struct TmEditor { impl TmEditor { pub fn new(epoch: i64, utc: bool) -> Result { - let mut t = if utc { gmtime(epoch)? } else { localtime(epoch)? }; - t.tm_year += 1900; // real years for clarity + let t = if utc { gmtime(epoch)? } else { localtime(epoch)? }; Ok(Self { utc, t, changes: TMChanges::all() }) } pub fn into_epoch(mut self) -> Result { - self.t.tm_year -= 1900; let epoch = if self.utc { timegm(&mut self.t)? } else { timelocal(&mut self.t)? }; Ok(epoch) } @@ -47,6 +45,7 @@ impl TmEditor { self.normalize_time() } + pub fn year(&self) -> libc::c_int { self.t.tm_year + 1900 } // see man mktime pub fn hour(&self) -> libc::c_int { self.t.tm_hour } pub fn min(&self) -> libc::c_int { self.t.tm_min } pub fn sec(&self) -> libc::c_int { self.t.tm_sec } @@ -112,7 +111,7 @@ impl TmEditor { } pub fn set_year(&mut self, v: libc::c_int) -> Result<(), Error> { - self.t.tm_year = v; + self.t.tm_year = v - 1900; self.changes.insert(TMChanges::YEAR); self.normalize_time() } -- 2.20.1