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 A6C84BC061 for ; Thu, 28 Mar 2024 13:38:05 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 930769F98 for ; Thu, 28 Mar 2024 13:37:46 +0100 (CET) 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 ; Thu, 28 Mar 2024 13:37:44 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 027B942A2A for ; Thu, 28 Mar 2024 13:37:44 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Thu, 28 Mar 2024 13:36:44 +0100 Message-Id: <20240328123707.336951-36-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240328123707.336951-1-c.ebner@proxmox.com> References: <20240328123707.336951-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.030 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 Subject: [pbs-devel] [PATCH v3 proxmox-backup 35/58] pxar: show padding in debug output on archive list 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, 28 Mar 2024 12:38:05 -0000 In addition to the entries, also show the padding encountered in-between referenced payloads. Example invocation: `PXAR_LOG=debug pxar list archive.mpxar` Signed-off-by: Christian Ebner --- changes since version 2: - not present in previous version pxar-bin/src/main.rs | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pxar-bin/src/main.rs b/pxar-bin/src/main.rs index 44a6fa8a1..58c9d2cfd 100644 --- a/pxar-bin/src/main.rs +++ b/pxar-bin/src/main.rs @@ -9,6 +9,7 @@ use std::sync::Arc; use anyhow::{bail, format_err, Error}; use futures::future::FutureExt; use futures::select; +use pxar::EntryKind; use tokio::signal::unix::{signal, SignalKind}; use pathpatterns::{MatchEntry, MatchType, PatternFlag}; @@ -456,10 +457,28 @@ async fn mount_archive(archive: String, mountpoint: String, verbose: bool) -> Re )] /// List the contents of an archive. fn dump_archive(archive: String) -> Result<(), Error> { + let mut last = None; for entry in pxar::decoder::Decoder::open(archive)? { let entry = entry?; if log::log_enabled!(log::Level::Debug) { + match entry.kind() { + EntryKind::File { + payload_offset: Some(offset), + size, + .. + } => { + if let Some(last) = last { + let skipped = offset - last; + if skipped > 0 { + log::debug!("Encountered padding of {skipped} bytes"); + } + } + last = Some(offset + size + std::mem::size_of::() as u64); + } + _ => (), + } + log::debug!("{}", format_single_line_entry(&entry)); } else { log::info!("{:?}", entry.path()); -- 2.39.2