diff options
| author | Martin Matuska <martin@matuska.org> | 2020-01-25 14:26:59 +0100 |
|---|---|---|
| committer | Martin Matuska <martin@matuska.org> | 2020-01-25 14:26:59 +0100 |
| commit | bcaa4a4d270544dfd5e0f661d7524ab94beda174 (patch) | |
| tree | 5a2ddd6386b1afa9d3298199d6b198b23f157e5d /libarchive/archive_write_set_format_ustar.c | |
| parent | d653d0b38de56f30dab6516d41b9793f6827adfe (diff) | |
| download | libarchive-bcaa4a4d270544dfd5e0f661d7524ab94beda174.tar.gz | |
Unify unsupported entry file type error message in writer
Closes #1320
Diffstat (limited to 'libarchive/archive_write_set_format_ustar.c')
| -rw-r--r-- | libarchive/archive_write_set_format_ustar.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/libarchive/archive_write_set_format_ustar.c b/libarchive/archive_write_set_format_ustar.c index ad4ccb77..e1fe974a 100644 --- a/libarchive/archive_write_set_format_ustar.c +++ b/libarchive/archive_write_set_format_ustar.c @@ -44,6 +44,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_ustar.c 191579 #include "archive_entry_locale.h" #include "archive_private.h" #include "archive_write_private.h" +#include "archive_write_set_format_private.h" struct ustar { uint64_t entry_bytes_remaining; @@ -609,16 +610,9 @@ __archive_write_format_header_ustar(struct archive_write *a, char h[512], case AE_IFBLK: h[USTAR_typeflag_offset] = '4' ; break; case AE_IFDIR: h[USTAR_typeflag_offset] = '5' ; break; case AE_IFIFO: h[USTAR_typeflag_offset] = '6' ; break; - case AE_IFSOCK: - archive_set_error(&a->archive, - ARCHIVE_ERRNO_FILE_FORMAT, - "tar format cannot archive socket"); - return (ARCHIVE_FAILED); - default: - archive_set_error(&a->archive, - ARCHIVE_ERRNO_FILE_FORMAT, - "tar format cannot archive this (mode=0%lo)", - (unsigned long)archive_entry_mode(entry)); + default: /* AE_IFSOCK and unknown */ + __archive_write_entry_filetype_unsupported( + &a->archive, entry, "ustar"); ret = ARCHIVE_FAILED; } } |