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 A177A60B61 for ; Thu, 3 Sep 2020 13:40:36 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 95942185CC 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 ADB7818550 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 76251449EC 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:59 +0200 Message-Id: <20200903114000.6932-10-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.086 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 09/10] tools/systemd/tm_editor: add setter/getter for months/years/days 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:36 -0000 add_* are modeled after add_days subtract one for set_mon to have a consistent interface for all fields (i.e. getter/setter return/expect the 'real' number, not the ones in the tm struct) Signed-off-by: Dominik Csapak --- src/tools/systemd/tm_editor.rs | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/src/tools/systemd/tm_editor.rs b/src/tools/systemd/tm_editor.rs index 529e17f6..871e4c4c 100644 --- a/src/tools/systemd/tm_editor.rs +++ b/src/tools/systemd/tm_editor.rs @@ -34,6 +34,31 @@ impl TmEditor { Ok(epoch) } + /// increases the year by 'years' and resets all smaller fields to their minimum + pub fn add_years(&mut self, years: libc::c_int) -> Result<(), Error> { + if years == 0 { return Ok(()); } + self.t.tm_mon = 0; + self.t.tm_mday = 1; + self.t.tm_hour = 0; + self.t.tm_min = 0; + self.t.tm_sec = 0; + self.t.tm_year += years; + self.changes = TMChanges::all(); + self.normalize_time() + } + + /// increases the month by 'months' and resets all smaller fields to their minimum + pub fn add_months(&mut self, months: libc::c_int) -> Result<(), Error> { + if months == 0 { return Ok(()); } + self.t.tm_mday = 1; + self.t.tm_hour = 0; + self.t.tm_min = 0; + self.t.tm_sec = 0; + self.t.tm_mon += months; + self.changes = TMChanges::all(); // adding a month can wrap the year + self.normalize_time() + } + /// increases the day by 'days' and resets all smaller fields to their minimum pub fn add_days(&mut self, days: libc::c_int) -> Result<(), Error> { if days == 0 { return Ok(()); } @@ -46,6 +71,8 @@ impl TmEditor { } pub fn year(&self) -> libc::c_int { self.t.tm_year + 1900 } // see man mktime + pub fn month(&self) -> libc::c_int { self.t.tm_mon + 1 } + pub fn day(&self) -> libc::c_int { self.t.tm_mday } 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 } @@ -105,7 +132,7 @@ impl TmEditor { } pub fn set_mon(&mut self, v: libc::c_int) -> Result<(), Error> { - self.t.tm_mon = v; + self.t.tm_mon = v - 1; self.changes.insert(TMChanges::MON); self.normalize_time() } -- 2.20.1