From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <c.ebner@proxmox.com> 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 B3FA6DAE0 for <pbs-devel@lists.proxmox.com>; Fri, 22 Sep 2023 09:17:20 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8B5A36AEC for <pbs-devel@lists.proxmox.com>; Fri, 22 Sep 2023 09:16:50 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 for <pbs-devel@lists.proxmox.com>; Fri, 22 Sep 2023 09:16:49 +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 81FDD4878A for <pbs-devel@lists.proxmox.com>; Fri, 22 Sep 2023 09:16:49 +0200 (CEST) From: Christian Ebner <c.ebner@proxmox.com> To: pbs-devel@lists.proxmox.com Date: Fri, 22 Sep 2023 09:16:05 +0200 Message-Id: <20230922071621.12670-5-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230922071621.12670-1-c.ebner@proxmox.com> References: <20230922071621.12670-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.123 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [lib.rs] Subject: [pbs-devel] [RFC pxar 4/20] fix #3174: metadata: impl fn to calc byte size X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion <pbs-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>, <mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/> List-Post: <mailto:pbs-devel@lists.proxmox.com> List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>, <mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe> X-List-Received-Date: Fri, 22 Sep 2023 07:17:20 -0000 Add a helper function to calculate the byte size of pxar Metadata objects, needed to be able to recalculate offsets when creating archives with appendix sections. Signed-off-by: Christian Ebner <c.ebner@proxmox.com> --- src/lib.rs | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/src/lib.rs b/src/lib.rs index 210c4b1..ed7ba40 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -144,6 +144,50 @@ impl Metadata { pub fn builder_from_stat(stat: &libc::stat) -> MetadataBuilder { MetadataBuilder::new(0).fill_from_stat(stat) } + + /// Calculate the number of bytes when serialized in pxar archive + pub fn calculate_byte_len(&self) -> usize { + let mut bytes = mem::size_of::<format::Header>(); + bytes += mem::size_of_val(&self.stat); + for xattr in &self.xattrs { + bytes += mem::size_of::<format::Header>(); + bytes += mem::size_of_val(xattr); + } + for acl_user in &self.acl.users { + bytes += mem::size_of::<format::Header>(); + bytes += mem::size_of_val(acl_user); + } + for acl_group in &self.acl.groups { + bytes += mem::size_of::<format::Header>(); + bytes += mem::size_of_val(acl_group); + } + if let Some(group_obj) = &self.acl.group_obj { + bytes += mem::size_of::<format::Header>(); + bytes += mem::size_of_val(group_obj); + } + if let Some(default) = &self.acl.default { + bytes += mem::size_of::<format::Header>(); + bytes += mem::size_of_val(default); + } + for acl_default_user in &self.acl.default_users { + bytes += mem::size_of::<format::Header>(); + bytes += mem::size_of_val(acl_default_user); + } + for acl_default_group in &self.acl.default_groups { + bytes += mem::size_of::<format::Header>(); + bytes += mem::size_of_val(acl_default_group); + } + if let Some(fcaps) = &self.fcaps { + bytes += mem::size_of::<format::Header>(); + bytes += mem::size_of_val(fcaps); + } + if let Some(quota_project_id) = &self.quota_project_id { + bytes += mem::size_of::<format::Header>(); + bytes += mem::size_of_val(quota_project_id); + } + + bytes + } } impl From<MetadataBuilder> for Metadata { -- 2.39.2