uncompress_archive: ignore warnings as those are not errors

Fixes: #85.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

CHANGES.md

@@ -4,6 +4,10 @@
 
 ## [Unreleased] - ReleaseDate
 
+* Avoid failing uncompressing files in case of ARCHIVE_WARN returns [#85]
+
+[#85]: https://github.com/OSSystems/compress-tools-rs/issues/85
+
 ## [0.12.3] - 2022-06-22
 
 * ci: windows: Use pre-installed vcpkg and fix build [#81]

scripts/generate-ffi

@@ -28,6 +28,8 @@ bindgen \
     --raw-line "pub const ARCHIVE_EOF: i32 = 1;" \
     --raw-line "pub const ARCHIVE_OK: i32 = 0;" \
     \
+    --whitelist-var "ARCHIVE_WARN" \
+    \
     --whitelist-var "ARCHIVE_EXTRACT_TIME" \
     --whitelist-var "ARCHIVE_EXTRACT_PERM" \
     --whitelist-var "ARCHIVE_EXTRACT_ACL" \

src/error.rs

@@ -27,11 +27,10 @@ pub enum Error {
 }
 
 pub(crate) fn archive_result(value: i32, archive: *mut ffi::archive) -> Result<()> {
-    if value != ffi::ARCHIVE_OK {
-        return Err(Error::from(archive));
+    match value {
+        ffi::ARCHIVE_OK | ffi::ARCHIVE_WARN => Ok(()),
+        _ => Err(Error::from(archive)),
     }
-
-    Ok(())
 }
 
 #[allow(clippy::not_unsafe_ptr_arg_deref)]

src/ffi/generated.rs

@@ -4,6 +4,7 @@
 pub(crate) const ARCHIVE_EOF: i32 = 1;
 pub(crate) const ARCHIVE_OK: i32 = 0;
 
+pub(crate) const ARCHIVE_WARN: i32 = -20;
 pub(crate) const ARCHIVE_EXTRACT_OWNER: u32 = 1;
 pub(crate) const ARCHIVE_EXTRACT_PERM: u32 = 2;
 pub(crate) const ARCHIVE_EXTRACT_TIME: u32 = 4;

src/lib.rs

@@ -244,9 +244,10 @@ where
                         ffi::archive_write_header(archive_writer, entry);
                         libarchive_copy_data(archive_reader, archive_writer)?;
 
-                        if ffi::archive_write_finish_entry(archive_writer) != ffi::ARCHIVE_OK {
-                            return Err(Error::from(archive_writer));
-                        }
+                        archive_result(
+                            ffi::archive_write_finish_entry(archive_writer),
+                            archive_writer,
+                        )?;
                     }
                     _ => return Err(Error::from(archive_reader)),
                 }