diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2020-12-01 10:36:46 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2020-12-01 10:36:46 +0000 |
| commit | d5f2a5ff11474589cccacfc8e153d437f48530e2 (patch) | |
| tree | aeb7e201bfb2d629755c396db8001e39d116e852 /libarchive/archive_write_set_format_cpio.c | |
| parent | 4dd2ae60c22045bc4e4f53a0cf45028322168ec0 (diff) | |
Notes
Diffstat (limited to 'libarchive/archive_write_set_format_cpio.c')
| -rw-r--r-- | libarchive/archive_write_set_format_cpio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libarchive/archive_write_set_format_cpio.c b/libarchive/archive_write_set_format_cpio.c index 729f9c775591..e06673352b68 100644 --- 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); } @@ -348,7 +348,7 @@ write_header(struct archive_write *a, struct archive_entry *entry) format_octal(archive_entry_nlink(entry), h + c_nlink_offset, c_nlink_size); if (archive_entry_filetype(entry) == AE_IFBLK || archive_entry_filetype(entry) == AE_IFCHR) - format_octal(archive_entry_dev(entry), h + c_rdev_offset, c_rdev_size); + format_octal(archive_entry_rdev(entry), h + c_rdev_offset, c_rdev_size); else format_octal(0, h + c_rdev_offset, c_rdev_size); format_octal(archive_entry_mtime(entry), h + c_mtime_offset, c_mtime_size); |