add a missing file entry to libarchive/CMakeLists.txt

diff --git a/libarchive/CMakeLists.txt b/libarchive/CMakeLists.txt
index d0f2fa94581f848526f4aeb85dc650a51e5e71ac..e1d76a5198d38a89ab8fe8d8d3a4193fa938f4f5 100644 (file)
--- a/libarchive/CMakeLists.txt
+++ b/libarchive/CMakeLists.txt
@@ -144,6 +144,7 @@ SET(libarchive_SOURCES
   archive_write_set_format_ar.c
   archive_write_set_format_by_name.c
   archive_write_set_format_cpio.c
+  archive_write_set_format_cpio_binary.c
   archive_write_set_format_cpio_newc.c
   archive_write_set_format_cpio_odc.c
   archive_write_set_format_filter_by_ext.c

diff --git a/libarchive/archive_read_support_format_cpio.c b/libarchive/archive_read_support_format_cpio.c
index d81752ea74e6cc83b3ebecc795424d8be8cf307d..6b8ae33a480b74b5c7f4e9340fcf9c11abeede8e 100644 (file)
--- a/libarchive/archive_read_support_format_cpio.c
+++ b/libarchive/archive_read_support_format_cpio.c
@@ -348,7 +348,7 @@ archive_read_format_cpio_options(struct archive_read *a,
        } else if (strcmp(key, "pwb")  == 0) {
                if (val != NULL && val[0] != 0)
                        cpio->option_pwb = 1;
-               ret = ARCHIVE_OK;
+               return (ARCHIVE_OK);
        }
 
        /* Note: The "warn" return is just to inform the options

diff --git a/libarchive/archive_write_set_format_cpio_binary.c b/libarchive/archive_write_set_format_cpio_binary.c
index b0081888897616565068c9fef5c3f14d069eb9d4..3f608c713a17b21f02b0c5ba19791171742bc25d 100644 (file)
--- a/libarchive/archive_write_set_format_cpio_binary.c
+++ b/libarchive/archive_write_set_format_cpio_binary.c
@@ -541,7 +541,7 @@ write_header(struct archive_write *a, struct archive_entry *entry)
                        goto exit_write_header;
                }
        }
-       
+
 exit_write_header:
        archive_entry_free(entry_main);
        return (ret_final);