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 351BF75347 for ; Wed, 21 Apr 2021 15:24:06 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0C993FA79 for ; Wed, 21 Apr 2021 15:24:06 +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 id B4852FA50 for ; Wed, 21 Apr 2021 15:24:04 +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 0A01845BC3 for ; Wed, 21 Apr 2021 15:18:18 +0200 (CEST) From: Stefan Reiter To: pbs-devel@lists.proxmox.com Date: Wed, 21 Apr 2021 15:18:09 +0200 Message-Id: <20210421131809.22607-5-s.reiter@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210421131809.22607-1-s.reiter@proxmox.com> References: <20210421131809.22607-1-s.reiter@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 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. [proxmox-file-restore.rs] Subject: [pbs-devel] [PATCH proxmox-backup 4/4] file-restore: allow extracting a full pxar archive 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: Wed, 21 Apr 2021 13:24:06 -0000 If the path for within the archive is empty, assume "/" to extract all of it. Signed-off-by: Stefan Reiter --- src/bin/proxmox-file-restore.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/bin/proxmox-file-restore.rs b/src/bin/proxmox-file-restore.rs index 7799a76d..2726eeb7 100644 --- a/src/bin/proxmox-file-restore.rs +++ b/src/bin/proxmox-file-restore.rs @@ -399,14 +399,16 @@ async fn extract_to_target( where T: pxar::accessor::ReadAt + Clone + Send + Sync + Unpin + 'static, { + let path = if path.is_empty() { b"/" } else { path }; + let root = decoder.open_root().await?; let file = root - .lookup(OsStr::from_bytes(&path)) + .lookup(OsStr::from_bytes(path)) .await? .ok_or_else(|| format_err!("error opening '{:?}'", path))?; if let Some(target) = target { - extract_sub_dir(target, decoder, OsStr::from_bytes(&path), verbose).await?; + extract_sub_dir(target, decoder, OsStr::from_bytes(path), verbose).await?; } else { match file.kind() { pxar::EntryKind::File { .. } => { @@ -416,7 +418,7 @@ where create_zip( tokio::io::stdout(), decoder, - OsStr::from_bytes(&path), + OsStr::from_bytes(path), verbose, ) .await?; -- 2.20.1