Fix writing of cpio archives containing hardlinks without file type

Fixes: https://github.com/libarchive/libarchive/issues/1386

diff --git a/libarchive/archive_write_set_format_cpio.c b/libarchive/archive_write_set_format_cpio.c
index 729f9c7755915febbb64e6d2c376c27d94b572d2..465e4ed284f946bbd47a376a0d8da35b047457e7 100644 (file)
--- a/libarchive/archive_write_set_format_cpio.c
+++ b/libarchive/archive_write_set_format_cpio.c
@@ -250,7 +250,7 @@ archive_write_cpio_header(struct archive_write *a, struct archive_entry *entry)
        const char *path;
        size_t len;
 
-       if (archive_entry_filetype(entry) == 0) {
+       if (archive_entry_filetype(entry) == 0 && archive_entry_hardlink(entry) == NULL) {
                archive_set_error(&a->archive, -1, "Filetype required");
                return (ARCHIVE_FAILED);
        }

diff --git a/libarchive/archive_write_set_format_cpio_newc.c b/libarchive/archive_write_set_format_cpio_newc.c
index 172fda62f0bb71d6fc0876c0f09441292e2e8644..f0f39809dad47112948d6cc20601ad471df2c72e 100644 (file)
--- a/libarchive/archive_write_set_format_cpio_newc.c
+++ b/libarchive/archive_write_set_format_cpio_newc.c
@@ -190,7 +190,7 @@ archive_write_newc_header(struct archive_write *a, struct archive_entry *entry)
        const char *path;
        size_t len;
 
-       if (archive_entry_filetype(entry) == 0) {
+       if (archive_entry_filetype(entry) == 0 && archive_entry_hardlink(entry) == NULL) {
                archive_set_error(&a->archive, -1, "Filetype required");
                return (ARCHIVE_FAILED);
        }