diff options
| author | eldritch horrors <pennae@lix.systems> | 2024-03-04 06:30:59 +0100 |
|---|---|---|
| committer | eldritch horrors <pennae@lix.systems> | 2024-03-04 07:11:25 +0100 |
| commit | dd2926f7ea378833c02326b983baca8008ff27f0 (patch) | |
| tree | eb3168ce531246203438bd90ed698ca570690e07 /src | |
| parent | bc32950ac5d507f34d557bbe035b9cb751e95247 (diff) | |
Merge pull request #9557 from bryanhonof/bryanhonof.fix-apple-double-shenanigans
Add option to libarchive so it behaves correctly
(cherry picked from commit c3827ff6348a4d5199eaddf8dbc2ca2e2ef46ec5)
Change-Id: Ib0f928851093f4c644bac071d1c8f8aeec803198
Diffstat (limited to 'src')
| -rw-r--r-- | src/libutil/tarfile.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libutil/tarfile.cc b/src/libutil/tarfile.cc index 5060a8f24..f3f04a936 100644 --- a/src/libutil/tarfile.cc +++ b/src/libutil/tarfile.cc @@ -52,6 +52,7 @@ TarArchive::TarArchive(Source & source, bool raw) : buffer(65536) archive_read_support_format_raw(archive); archive_read_support_format_empty(archive); } + archive_read_set_option(archive, NULL, "mac-ext", NULL); check(archive_read_open(archive, (void *)this, callback_open, callback_read, callback_close), "Failed to open archive (%s)"); } @@ -62,6 +63,7 @@ TarArchive::TarArchive(const Path & path) archive_read_support_filter_all(archive); archive_read_support_format_all(archive); + archive_read_set_option(archive, NULL, "mac-ext", NULL); check(archive_read_open_filename(archive, path.c_str(), 16384), "failed to open archive: %s"); } |