From 54362e63ce558bd7353370c09cb376b571809af8 Mon Sep 17 00:00:00 2001 From: Tom Ivar Helbekkmo Date: Sat, 6 Mar 2021 00:00:58 +0100 Subject: [PATCH] add a missing file entry to libarchive/CMakeLists.txt --- libarchive/CMakeLists.txt | 1 + libarchive/archive_read_support_format_cpio.c | 2 +- libarchive/archive_write_set_format_cpio_binary.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libarchive/CMakeLists.txt b/libarchive/CMakeLists.txt index d0f2fa945..e1d76a519 100644 --- 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 d81752ea7..6b8ae33a4 100644 --- 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 b00818888..3f608c713 100644 --- 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); -- 2.47.2