|
 |
2d7570 |
From afef3d7fc131df0dac09a46b8673898860a193db Mon Sep 17 00:00:00 2001
|
|
|
2d7570 |
From: Zdenek Zambersky <zzambers@redhat.com>
|
|
|
2d7570 |
Date: Tue, 11 Jan 2022 14:43:27 +0100
|
|
|
2d7570 |
Subject: [PATCH] Fixed size filed in pax header
|
|
|
2d7570 |
|
|
|
2d7570 |
---
|
|
|
2d7570 |
libarchive/archive_write_set_format_pax.c | 10 +++++++---
|
|
|
2d7570 |
1 file changed, 7 insertions(+), 3 deletions(-)
|
|
|
2d7570 |
|
|
|
2d7570 |
diff --git a/libarchive/archive_write_set_format_pax.c b/libarchive/archive_write_set_format_pax.c
|
|
|
2d7570 |
index a2b27107..52911491 100644
|
|
|
2d7570 |
--- a/libarchive/archive_write_set_format_pax.c
|
|
|
2d7570 |
+++ b/libarchive/archive_write_set_format_pax.c
|
|
|
2d7570 |
@@ -1028,10 +1028,8 @@ archive_write_pax_header(struct archive_write *a,
|
|
|
2d7570 |
archive_string_init(&entry_name);
|
|
|
2d7570 |
archive_strcpy(&entry_name, archive_entry_pathname(entry_main));
|
|
|
2d7570 |
|
|
|
2d7570 |
- /* If file size is too large, add 'size' to pax extended attrs. */
|
|
|
2d7570 |
+ /* If file size is too large, we need pax extended attrs. */
|
|
|
2d7570 |
if (archive_entry_size(entry_main) >= (((int64_t)1) << 33)) {
|
|
|
2d7570 |
- add_pax_attr_int(&(pax->pax_header), "size",
|
|
|
2d7570 |
- archive_entry_size(entry_main));
|
|
|
2d7570 |
need_extension = 1;
|
|
|
2d7570 |
}
|
|
|
2d7570 |
|
|
|
2d7570 |
@@ -1347,6 +1345,12 @@ archive_write_pax_header(struct archive_write *a,
|
|
|
2d7570 |
mapsize + pax->sparse_map_padding + sparse_total);
|
|
|
2d7570 |
}
|
|
|
2d7570 |
|
|
|
2d7570 |
+ /* If file size is too large, add 'size' to pax extended attrs. */
|
|
|
2d7570 |
+ if (archive_entry_size(entry_main) >= (((int64_t)1) << 33)) {
|
|
|
2d7570 |
+ add_pax_attr_int(&(pax->pax_header), "size",
|
|
|
2d7570 |
+ archive_entry_size(entry_main));
|
|
|
2d7570 |
+ }
|
|
|
2d7570 |
+
|
|
|
2d7570 |
/* Format 'ustar' header for main entry.
|
|
|
2d7570 |
*
|
|
|
2d7570 |
* The trouble with file size: If the reader can't understand
|
|
|
2d7570 |
--
|
|
|
2d7570 |
2.34.3
|
|
|
2d7570 |
|