Merge pull request #612 from wcampbell0x2a/update-deku-0.18-v2

backhand-test/tests/common/mod.rs

@@ -67,7 +67,7 @@ pub fn test_bin_unsquashfs(
     assert_success: bool,
     run_squashfs_tools_unsquashfs: bool,
 ) {
-    let tmp_dir = tempdir().unwrap();
+    let tmp_dir = tempdir_in(".").unwrap();
     // Run "our" unsquashfs against the control
     let cmd = get_base_command("unsquashfs-backhand")
         .env("RUST_LOG", "trace")

backhand/Cargo.toml

@@ -16,7 +16,7 @@ all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
 [dependencies]
-deku = "0.17.0"
+deku = { version = "0.18.1", default-features = false, features = ["std"] }
 tracing = { version = "0.1.40" }
 thiserror = "1.0.63"
 flate2 = { version = "1.0.33", optional = true, features = ["zlib-ng"] }

backhand/src/compressor.rs

@@ -375,7 +375,7 @@ impl CompressionAction for DefaultCompressor {
         if let Some(options) = &fs_compressor.options {
             trace!("writing compression options");
             superblock.flags |= Flags::CompressorOptionsArePresent as u16;
-            let mut compression_opt_buf_out = vec![];
+            let mut compression_opt_buf_out = Cursor::new(vec![]);
             let mut writer = Writer::new(&mut compression_opt_buf_out);
             match options {
                 CompressionOptions::Gzip(gzip) => {
@@ -398,7 +398,7 @@ impl CompressionAction for DefaultCompressor {
                 superblock.block_size,
                 Kind { inner: kind.inner.clone() },
             );
-            metadata.write_all(&compression_opt_buf_out)?;
+            metadata.write_all(compression_opt_buf_out.get_ref())?;
             metadata.finalize(&mut w)?;
         }
 

backhand/src/filesystem/writer.rs

@@ -1,5 +1,5 @@
 use std::ffi::OsStr;
-use std::io::{Read, Seek, SeekFrom, Write};
+use std::io::{Cursor, Read, Seek, SeekFrom, Write};
 use std::num::NonZeroUsize;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
@@ -622,11 +622,11 @@ impl<'a, 'b, 'c> FilesystemWriter<'a, 'b, 'c> {
         trace!("WRITING DIR: {block_offset:#02x?}");
         let mut total_size: usize = 3;
         for dir in Entry::into_dir(entries) {
-            let mut bytes = vec![];
+            let mut bytes = Cursor::new(vec![]);
             let mut writer = Writer::new(&mut bytes);
             dir.to_writer(&mut writer, kind.inner.type_endian)?;
-            total_size += bytes.len();
-            dir_writer.write_all(&bytes)?;
+            total_size += bytes.get_ref().len();
+            dir_writer.write_all(bytes.get_ref())?;
         }
         let entry = Entry::path(
             filename,
@@ -831,25 +831,28 @@ impl<'a, 'b, 'c> FilesystemWriter<'a, 'b, 'c> {
         W: Write + Seek,
     {
         let mut ptrs: Vec<u64> = vec![];
-        let mut table_bytes = Vec::with_capacity(table.len() * element_size);
+        let mut table_bytes = Cursor::new(Vec::with_capacity(table.len() * element_size));
         let mut iter = table.iter().peekable();
         while let Some(t) = iter.next() {
             // convert fragment ptr to bytes
             let mut table_writer = Writer::new(&mut table_bytes);
             t.to_writer(&mut table_writer, self.kind.inner.type_endian)?;
 
             // once table_bytes + next is over the maximum size of a metadata block, write
-            if ((table_bytes.len() + element_size) > METADATA_MAXSIZE) || iter.peek().is_none() {
+            if ((table_bytes.get_ref().len() + element_size) > METADATA_MAXSIZE)
+                || iter.peek().is_none()
+            {
                 ptrs.push(w.stream_position()?);
 
                 // write metadata len
-                let len = metadata::set_if_uncompressed(table_bytes.len() as u16);
+                let len = metadata::set_if_uncompressed(table_bytes.get_ref().len() as u16);
                 let mut writer = Writer::new(&mut w);
                 len.to_writer(&mut writer, self.kind.inner.data_endian)?;
                 // write metadata bytes
-                w.write_all(&table_bytes)?;
+                w.write_all(table_bytes.get_ref())?;
 
-                table_bytes.clear();
+                table_bytes.get_mut().clear();
+                table_bytes.rewind()?;
             }
         }
 

backhand/src/inode.rs

@@ -1,7 +1,7 @@
 //! Index Node for file or directory
 
 use core::fmt;
-use std::io::Write;
+use std::io::{Cursor, Write};
 
 use deku::prelude::*;
 
@@ -35,7 +35,7 @@ impl Inode {
         superblock: &SuperBlock,
         kind: &Kind,
     ) -> Entry<'a> {
-        let mut inode_bytes = vec![];
+        let mut inode_bytes = Cursor::new(vec![]);
         let mut writer = Writer::new(&mut inode_bytes);
         self.to_writer(
             &mut writer,
@@ -49,7 +49,7 @@ impl Inode {
         .unwrap();
         let start = m_writer.metadata_start;
         let offset = m_writer.uncompressed_bytes.len() as u16;
-        m_writer.write_all(&inode_bytes).unwrap();
+        m_writer.write_all(inode_bytes.get_ref()).unwrap();
 
         Entry {
             start,

backhand/src/metadata.rs

@@ -112,7 +112,7 @@ impl Write for MetadataWriter {
     }
 }
 
-pub fn read_block<R: Read>(
+pub fn read_block<R: Read + Seek>(
     reader: &mut R,
     superblock: &SuperBlock,
     kind: &Kind,