From 97bbd1bf9e53197697bb2a53d7aa4b5c00775fba Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Wed, 14 Oct 2020 11:31:42 +0200
Subject: [PATCH] pxar: pass full path to callback, let verbose flag list files

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
 src/client/pxar_backup_stream.rs | 9 +++++++--
 src/pxar/create.rs               | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/client/pxar_backup_stream.rs b/src/client/pxar_backup_stream.rs
index 7ccca4f0..30ca8af5 100644
--- a/src/client/pxar_backup_stream.rs
+++ b/src/client/pxar_backup_stream.rs
@@ -40,7 +40,7 @@ impl PxarBackupStream {
         dir: Dir,
         _path: PathBuf,
         device_set: Option<HashSet<u64>>,
-        _verbose: bool,
+        verbose: bool,
         skip_lost_and_found: bool,
         catalog: Arc<Mutex<CatalogWriter<W>>>,
         patterns: Vec<MatchEntry>,
@@ -70,7 +70,12 @@ impl PxarBackupStream {
                         crate::pxar::Flags::DEFAULT,
                         device_set,
                         skip_lost_and_found,
-                        |_| Ok(()),
+                        |path| {
+                            if verbose {
+                                println!("{:?}", path);
+                            }
+                            Ok(())
+                        },
                         entries_max,
                         Some(&mut *catalog_guard),
                     ) {
diff --git a/src/pxar/create.rs b/src/pxar/create.rs
index a430e22b..f032fe26 100644
--- a/src/pxar/create.rs
+++ b/src/pxar/create.rs
@@ -235,7 +235,7 @@ impl<'a, 'b> Archiver<'a, 'b> {
                 continue;
             }
 
-            (self.callback)(Path::new(OsStr::from_bytes(file_name)))?;
+            (self.callback)(&file_entry.path)?;
             self.path = file_entry.path;
             self.add_entry(encoder, dir_fd, &file_entry.name, &file_entry.stat)
                 .map_err(|err| self.wrap_err(err))?;