Merge pull request #360 from rbran/fix-push-dir-all

Fix issue 359, missing uid/gid
wcampbell0x2a · Nov 22, 2023 · 7da9724 · 7da9724
2 parents 42bcf6f + 47c5918
commit 7da9724
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/backhand-test/tests/issues.rs b/backhand-test/tests/issues.rs
@@ -6,3 +6,14 @@ fn issue_275() {
     let mut fs = backhand::FilesystemWriter::default();
     fs.write(&mut writer).unwrap();
 }
+
+/// https://github.com/wcampbell0x2a/backhand/issues/359
+#[test]
+#[cfg(feature = "xz")]
+fn issue_359() {
+    let mut writer = std::io::Cursor::new(vec![]);
+    let mut fs = backhand::FilesystemWriter::default();
+    let header = backhand::NodeHeader { permissions: 0, uid: 1, gid: 2, mtime: 3 };
+    fs.push_dir_all("a/b/c/d/e/f/g", header).unwrap();
+    fs.write(&mut writer).unwrap();
+}
diff --git a/backhand/src/filesystem/writer.rs b/backhand/src/filesystem/writer.rs
@@ -350,16 +350,7 @@ impl<'a, 'b> FilesystemWriter<'a, 'b> {
                     }
                 }
                 //if the dir don't exists, create it
-                Err(index) => {
-                    self.root.nodes.insert(
-                        index,
-                        Node::new(
-                            file.to_path_buf(),
-                            header,
-                            InnerNode::Dir(SquashfsDir::default()),
-                        ),
-                    );
-                }
+                Err(_index) => self.push_dir(file, header)?,
             }
         }
         Ok(())