encoder: add fifo and socket support

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/src/encoder.rs b/src/encoder.rs
index 4cf3b54975839a15ed41307fbfd22d156892cc8a..6d923424814a6b2e1e601da7b7b90cd2d49c6449 100644 (file)
--- a/src/encoder.rs
+++ b/src/encoder.rs
@@ -247,7 +247,7 @@ impl<'a, T: SeqWrite + 'a> EncoderImpl<'a, T> {
         match self.state.encode_error {
             Some(EncodeError::IncompleteFile) => io_bail!("incomplete file"),
             Some(EncodeError::IncompleteDirectory) => io_bail!("directory not finalized"),
-            None => Ok(())
+            None => Ok(()),
         }
     }
 
@@ -348,8 +348,12 @@ impl<'a, T: SeqWrite + 'a> EncoderImpl<'a, T> {
         target: &Path,
         htype: u64,
     ) -> io::Result<()> {
-        self.add_file_entry(metadata, file_name, htype, target.as_os_str().as_bytes())
-            .await
+        self.add_file_entry(
+            metadata,
+            file_name,
+            Some((htype, target.as_os_str().as_bytes())),
+        )
+        .await
     }
 
     pub async fn add_device(
@@ -358,6 +362,10 @@ impl<'a, T: SeqWrite + 'a> EncoderImpl<'a, T> {
         file_name: &Path,
         device: format::Device,
     ) -> io::Result<()> {
+        if !metadata.is_device() {
+            io_bail!("entry added via add_device must have a device mode in its metadata");
+        }
+
         let device = device.to_le();
         let device = unsafe {
             std::slice::from_raw_parts(
@@ -365,16 +373,31 @@ impl<'a, T: SeqWrite + 'a> EncoderImpl<'a, T> {
                 size_of::<format::Device>(),
             )
         };
-        self.add_file_entry(metadata, file_name, format::PXAR_DEVICE, device)
+        self.add_file_entry(metadata, file_name, Some((format::PXAR_DEVICE, device)))
             .await
     }
 
+    pub async fn add_fifo(&mut self, metadata: &Metadata, file_name: &Path) -> io::Result<()> {
+        if !metadata.is_fifo() {
+            io_bail!("entry added via add_device must be of type fifo in its metadata");
+        }
+
+        self.add_file_entry(metadata, file_name, None).await
+    }
+
+    pub async fn add_socket(&mut self, metadata: &Metadata, file_name: &Path) -> io::Result<()> {
+        if !metadata.is_socket() {
+            io_bail!("entry added via add_device must be of type socket in its metadata");
+        }
+
+        self.add_file_entry(metadata, file_name, None).await
+    }
+
     async fn add_file_entry(
         &mut self,
         metadata: &Metadata,
         file_name: &Path,
-        htype: u64,
-        entry_data: &[u8],
+        entry_htype_data: Option<(u64, &[u8])>,
     ) -> io::Result<()> {
         self.check()?;
 
@@ -383,9 +406,11 @@ impl<'a, T: SeqWrite + 'a> EncoderImpl<'a, T> {
         let file_name = file_name.as_os_str().as_bytes();
 
         self.start_file_do(metadata, file_name).await?;
-        (&mut self.output as &mut dyn SeqWrite)
-            .seq_write_pxar_entry_zero(htype, entry_data)
-            .await?;
+        if let Some((htype, entry_data)) = entry_htype_data {
+            (&mut self.output as &mut dyn SeqWrite)
+                .seq_write_pxar_entry_zero(htype, entry_data)
+                .await?;
+        }
 
         let end_offset = (&mut self.output as &mut dyn SeqWrite).position().await?;
 

diff --git a/src/encoder/aio.rs b/src/encoder/aio.rs
index 4cc10aae8d74068ca65aa076953521839b6d4b76..8f96fc3b645b3b9e009ea67bb9d5d45f95896ec8 100644 (file)
--- a/src/encoder/aio.rs
+++ b/src/encoder/aio.rs
@@ -167,6 +167,24 @@ impl<'a, T: SeqWrite + 'a> Encoder<'a, T> {
             .add_device(metadata, file_name.as_ref(), device)
             .await
     }
+
+    /// Add a device node to the archive.
+    pub async fn add_fifo<P: AsRef<Path>>(
+        &mut self,
+        metadata: &Metadata,
+        file_name: P,
+    ) -> io::Result<()> {
+        self.inner.add_fifo(metadata, file_name.as_ref()).await
+    }
+
+    /// Add a device node to the archive.
+    pub async fn add_socket<P: AsRef<Path>>(
+        &mut self,
+        metadata: &Metadata,
+        file_name: P,
+    ) -> io::Result<()> {
+        self.inner.add_socket(metadata, file_name.as_ref()).await
+    }
 }
 
 #[repr(transparent)]

diff --git a/src/encoder/sync.rs b/src/encoder/sync.rs
index 60df76188384cf74e33533b3e7bec9c236ac2da3..8a37072ab61f9218bf45d7cc5e5edc39b1694991 100644 (file)
--- a/src/encoder/sync.rs
+++ b/src/encoder/sync.rs
@@ -148,6 +148,24 @@ impl<'a, T: SeqWrite + 'a> Encoder<'a, T> {
     ) -> io::Result<()> {
         poll_result_once(self.inner.add_device(metadata, file_name.as_ref(), device))
     }
+
+    /// Add a fifo node to the archive.
+    pub fn add_fifo<P: AsRef<Path>>(
+        &mut self,
+        metadata: &Metadata,
+        file_name: P,
+    ) -> io::Result<()> {
+        poll_result_once(self.inner.add_fifo(metadata, file_name.as_ref()))
+    }
+
+    /// Add a socket node to the archive.
+    pub fn add_socket<P: AsRef<Path>>(
+        &mut self,
+        metadata: &Metadata,
+        file_name: P,
+    ) -> io::Result<()> {
+        poll_result_once(self.inner.add_socket(metadata, file_name.as_ref()))
+    }
 }
 
 #[repr(transparent)]