From 656b23e10746c3a997569d0bcca70ccf8be456d7 Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Mon, 11 Mar 2019 07:27:45 +0100
Subject: [PATCH] src/catar/decoder.rs: dir_mkdirat - add create_new flag

---
 src/catar/decoder.rs              | 20 ++++++++++++++++----
 src/client/catar_decode_writer.rs |  2 +-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/catar/decoder.rs b/src/catar/decoder.rs
index 875f8871..591fd00d 100644
--- a/src/catar/decoder.rs
+++ b/src/catar/decoder.rs
@@ -212,6 +212,7 @@ impl <'a, R: Read> CaTarDecoder<'a, R> {
         path: &mut PathBuf, // used for error reporting
         filename: &OsStr,  // repeats path last component
         parent: &nix::dir::Dir,
+        create_new: bool,
         callback: &F,
     ) -> Result<(), Error> {
 
@@ -227,7 +228,7 @@ impl <'a, R: Read> CaTarDecoder<'a, R> {
         let ifmt = mode & libc::S_IFMT;
 
         if ifmt == libc::S_IFDIR {
-            let dir = match dir_mkdirat(parent_fd, filename) {
+            let dir = match dir_mkdirat(parent_fd, filename, create_new) {
                 Ok(dir) => dir,
                 Err(err) => bail!("unable to open directory {:?} - {}", path, err),
             };
@@ -238,7 +239,8 @@ impl <'a, R: Read> CaTarDecoder<'a, R> {
                 let name = self.read_filename(head.size)?;
                 path.push(&name);
                 println!("NAME: {:?}", path);
-                self.restore_sequential(path, &name, &dir, callback)?;
+
+                self.restore_sequential(path, &name, &dir, true, callback)?;
                 path.pop();
 
                 head = self.read_item()?;
@@ -393,13 +395,23 @@ fn file_openat(parent: RawFd, filename: &OsStr, flags: OFlag, mode: Mode) -> Res
     Ok(file)
 }
 
-fn dir_mkdirat(parent: RawFd, filename: &OsStr) -> Result<nix::dir::Dir, Error> {
+fn dir_mkdirat(parent: RawFd, filename: &OsStr, create_new: bool) -> Result<nix::dir::Dir, nix::Error> {
 
     // call mkdirat first
     let res = filename.with_nix_path(|cstr| unsafe {
         libc::mkdirat(parent, cstr.as_ptr(), libc::S_IRWXU)
     })?;
-    Errno::result(res)?;
+
+    match Errno::result(res) {
+        Ok(_) => {},
+        Err(err) => {
+            if err == nix::Error::Sys(nix::errno::Errno::EEXIST) {
+                if create_new { return Err(err); }
+            } else {
+                return Err(err);
+            }
+        }
+    }
 
     let dir = nix::dir::Dir::openat(parent, filename, OFlag::O_DIRECTORY,  Mode::empty())?;
 
diff --git a/src/client/catar_decode_writer.rs b/src/client/catar_decode_writer.rs
index eb5d7e6e..2bdea2cd 100644
--- a/src/client/catar_decode_writer.rs
+++ b/src/client/catar_decode_writer.rs
@@ -44,7 +44,7 @@ impl CaTarBackupWriter {
             let mut decoder = CaTarDecoder::new(&mut reader);
 
             
-            if let Err(err) = decoder.restore_sequential(&mut path, &subdir, &dir, & |path| {
+            if let Err(err) = decoder.restore_sequential(&mut path, &subdir, &dir, false, & |path| {
                 println!("RESTORE: {:?}", path);
                 Ok(())
             }) {