archive_r_ruby 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 648064959d139565d2e122215cb49ae178b9d5e735a99176b8d785238b753800
-  data.tar.gz: d9f05748fbcca7aa76bb615b53480c9133423905c1137005d1c6df895a8b09c3
+  metadata.gz: a67077047d1881a2760f1e04788746c09f7476ac86543d0edf506446f3c95d27
+  data.tar.gz: 7c9c88796f1382285ff08cbcc2e61e59cbe517ef81d72eb7d41ef2c20ddb438a
 SHA512:
-  metadata.gz: dd1b45fd72e08536d0b95b261b8ca071d68fa0a1840c984c9d5aae4d9449b394a11ad6e7f8a4ca8df53b68ee7aef68791468e98404fd6a4ec098a34d831affd6
-  data.tar.gz: ebf2a08b3ff59ba317b48cd175d87bf0624e2d4c67d2c95c90b1c8fb32cd9c1afa6ff48f0d24cb467401d3b9b2364cf368946cf4af01e8bdb744431ee9cd961f
+  metadata.gz: a5129e0027a2f4bd1d9bf99f98589f9713408deb0a3ebf207101af4ea25b371ee81396579396590e6b659187967a84fb967d9cbc5dae6cf167eeb3f4345b43ed
+  data.tar.gz: 118cb09083a9ca57fa4a90ad719a16178bcdd4d5f7926892f31c5849a9af0e40487dfe1d4f6bdaee61c684d942db3b3c43195fcee7d510ddcf0ed5b8f34a1f00

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 archive_r Team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/NOTICE

@@ -0,0 +1,71 @@
+archive_r Notices
+
+This file contains third-party notices and licensing information for bundled or
+linked components. It does not replace the project license.
+
+----------------------------------------
+Third-Party Notices
+----------------------------------------
+
+This distribution bundles or links against the following third-party
+components. Their respective license terms apply in addition to the MIT
+License.
+
+1. libarchive
+	- Purpose: core archive reading and writing functionality for the C++
+	  library and language bindings.
+	- License: New BSD License (https://www.libarchive.org/)
+
+2. pybind11
+	- Purpose: header-only binding generator for the Python extension module.
+	- License: BSD-style License (https://github.com/pybind/pybind11)
+
+The following components are redistributed only because libarchive (bundled with archive_r) depends on them at runtime:
+
+3. zlib
+	- Purpose: libarchive dependency providing DEFLATE compression; bundled inside archive_r binaries and wheels because libarchive requires it.
+	- License: zlib License (https://zlib.net/zlib_license.html)
+
+4. bzip2
+	- Purpose: libarchive dependency providing bzip2 compression support; distributed with archive_r artifacts.
+	- License: BSD-style license (https://sourceware.org/bzip2/)
+
+5. liblzma (XZ Utils)
+	- Purpose: libarchive dependency providing LZMA/XZ compression; included with archive_r packages.
+	- License: Public Domain + GNU LGPLv2.1+ (https://tukaani.org/xz/)
+
+6. libxml2
+	- Purpose: libarchive dependency used for archive formats such as xar; distributed alongside archive_r.
+	- License: MIT-style License (http://xmlsoft.org/)
+
+7. zstd
+	- Purpose: libarchive dependency providing Zstandard compression; shipped within archive_r binaries.
+	- License: BSD License (https://github.com/facebook/zstd)
+
+8. Nettle
+	- Purpose: libarchive dependency providing cryptographic support (macOS/Linux); bundled with archive_r binaries.
+	- License: GNU LGPLv3+ or GNU GPLv2+ (https://www.lysator.liu.se/~nisse/nettle/)
+
+9. mini-gmp
+	- Purpose: Nettle dependency for arithmetic operations (macOS/Linux); bundled with archive_r binaries.
+	- License: GNU LGPLv3+ or GNU GPLv2+ (https://gmplib.org/)
+
+10. OpenSSL 3
+	- Purpose: libarchive dependency providing cryptographic support (Windows); bundled with archive_r Windows wheels.
+	- License: Apache License 2.0 with OpenSSL exception (https://www.openssl.org/source/license.html)
+
+11. lz4
+	- Purpose: libarchive dependency providing LZ4 compression; shipped with archive_r artifacts when required.
+	- License: BSD 2-Clause (https://github.com/lz4/lz4)
+
+12. libb2 (BLAKE2)
+	- Purpose: libarchive dependency providing BLAKE2 hashing; bundled when archive formats require it.
+	- License: CC0 1.0 Universal (https://github.com/BLAKE2/libb2)
+
+13. libattr
+	- Purpose: libarchive dependency providing extended attribute support on POSIX platforms; included in POSIX builds only.
+	- License: LGPL-2.1-or-later for the library (https://savannah.nongnu.org/projects/attr)
+
+14. libacl
+	- Purpose: libarchive dependency providing POSIX ACL support; included in POSIX builds only.
+	- License: LGPL-2.1-or-later for the library (https://savannah.nongnu.org/projects/acl)

data/VERSION

@@ -0,0 +1 @@
+0.1.9

data/ext/archive_r/archive_r_ext.cc

@@ -12,13 +12,16 @@
 #include <cstring>
 #include <memory>
 #include <ruby.h>
+#ifdef memcpy
+#undef memcpy
+#endif
+#include <limits>
+#include <optional>
 #include <stdexcept>
 #include <string>
 #include <utility>
 #include <variant>
 #include <vector>
-#include <limits>
-#include <optional>
 
 using namespace archive_r;
 
@@ -292,16 +295,14 @@ static void stream_wrapper_free(void *ptr) {
   delete wrapper;
 }
 
-static size_t stream_wrapper_memsize(const void *ptr) {
-  return sizeof(RubyStreamWrapper);
-}
+static size_t stream_wrapper_memsize(const void *ptr) { return sizeof(RubyStreamWrapper); }
 
 static const rb_data_type_t stream_wrapper_type = {
   "ArchiveR::Stream",
   {
-    nullptr,
-    stream_wrapper_free,
-    stream_wrapper_memsize,
+      nullptr,
+      stream_wrapper_free,
+      stream_wrapper_memsize,
   },
   nullptr,
   nullptr,

data/ext/archive_r/vendor/archive_r/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 archive_r Team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/ext/archive_r/vendor/archive_r/NOTICE

@@ -0,0 +1,71 @@
+archive_r Notices
+
+This file contains third-party notices and licensing information for bundled or
+linked components. It does not replace the project license.
+
+----------------------------------------
+Third-Party Notices
+----------------------------------------
+
+This distribution bundles or links against the following third-party
+components. Their respective license terms apply in addition to the MIT
+License.
+
+1. libarchive
+	- Purpose: core archive reading and writing functionality for the C++
+	  library and language bindings.
+	- License: New BSD License (https://www.libarchive.org/)
+
+2. pybind11
+	- Purpose: header-only binding generator for the Python extension module.
+	- License: BSD-style License (https://github.com/pybind/pybind11)
+
+The following components are redistributed only because libarchive (bundled with archive_r) depends on them at runtime:
+
+3. zlib
+	- Purpose: libarchive dependency providing DEFLATE compression; bundled inside archive_r binaries and wheels because libarchive requires it.
+	- License: zlib License (https://zlib.net/zlib_license.html)
+
+4. bzip2
+	- Purpose: libarchive dependency providing bzip2 compression support; distributed with archive_r artifacts.
+	- License: BSD-style license (https://sourceware.org/bzip2/)
+
+5. liblzma (XZ Utils)
+	- Purpose: libarchive dependency providing LZMA/XZ compression; included with archive_r packages.
+	- License: Public Domain + GNU LGPLv2.1+ (https://tukaani.org/xz/)
+
+6. libxml2
+	- Purpose: libarchive dependency used for archive formats such as xar; distributed alongside archive_r.
+	- License: MIT-style License (http://xmlsoft.org/)
+
+7. zstd
+	- Purpose: libarchive dependency providing Zstandard compression; shipped within archive_r binaries.
+	- License: BSD License (https://github.com/facebook/zstd)
+
+8. Nettle
+	- Purpose: libarchive dependency providing cryptographic support (macOS/Linux); bundled with archive_r binaries.
+	- License: GNU LGPLv3+ or GNU GPLv2+ (https://www.lysator.liu.se/~nisse/nettle/)
+
+9. mini-gmp
+	- Purpose: Nettle dependency for arithmetic operations (macOS/Linux); bundled with archive_r binaries.
+	- License: GNU LGPLv3+ or GNU GPLv2+ (https://gmplib.org/)
+
+10. OpenSSL 3
+	- Purpose: libarchive dependency providing cryptographic support (Windows); bundled with archive_r Windows wheels.
+	- License: Apache License 2.0 with OpenSSL exception (https://www.openssl.org/source/license.html)
+
+11. lz4
+	- Purpose: libarchive dependency providing LZ4 compression; shipped with archive_r artifacts when required.
+	- License: BSD 2-Clause (https://github.com/lz4/lz4)
+
+12. libb2 (BLAKE2)
+	- Purpose: libarchive dependency providing BLAKE2 hashing; bundled when archive formats require it.
+	- License: CC0 1.0 Universal (https://github.com/BLAKE2/libb2)
+
+13. libattr
+	- Purpose: libarchive dependency providing extended attribute support on POSIX platforms; included in POSIX builds only.
+	- License: LGPL-2.1-or-later for the library (https://savannah.nongnu.org/projects/attr)
+
+14. libacl
+	- Purpose: libarchive dependency providing POSIX ACL support; included in POSIX builds only.
+	- License: LGPL-2.1-or-later for the library (https://savannah.nongnu.org/projects/acl)

data/ext/archive_r/vendor/archive_r/include/archive_r/data_stream.h

@@ -3,12 +3,12 @@
 
 #pragma once
 
-#include "archive_r/platform_compat.h"
 #include "archive_r/path_hierarchy.h"
+#include "archive_r/platform_compat.h"
 
+#include <cstdint>
 #include <functional>
 #include <memory>
-#include <cstdint>
 
 namespace archive_r {
 

data/ext/archive_r/vendor/archive_r/include/archive_r/entry.h

@@ -97,8 +97,8 @@ public:
   /**
    * @brief Read data from the entry
    *
-    * Each call uses an internal ArchiveStackOrchestrator so reads remain valid even
-    * if the owning iterator advances.
+   * Each call uses an internal ArchiveStackOrchestrator so reads remain valid even
+   * if the owning iterator advances.
    *
    * @param buffer Buffer to read data into
    * @param length Maximum number of bytes to read
@@ -109,9 +109,9 @@ public:
   /**
    * @brief Enable or disable automatic descent into this entry
    * @param enabled true to descend (default), false to keep traversal at current level
-    *
-    * This control is only available for entries that are managed by a Traverser.
-    * Calling this on an Entry that is not traverser-managed reports a fault.
+   *
+   * This control is only available for entries that are managed by a Traverser.
+   * Calling this on an Entry that is not traverser-managed reports a fault.
    */
   void set_descent(bool enabled);
 
@@ -139,9 +139,9 @@ public:
    *     }
    * }
    * @endcode
-  *
-  * This control is only available for entries that are managed by a Traverser.
-  * Calling this on an Entry that is not traverser-managed reports a fault.
+   *
+   * This control is only available for entries that are managed by a Traverser.
+   * Calling this on an Entry that is not traverser-managed reports a fault.
    */
   void set_multi_volume_group(const std::string &base_name, const MultiVolumeGroupOptions &options = {});
 

data/ext/archive_r/vendor/archive_r/include/archive_r/multi_volume_stream_base.h

@@ -30,8 +30,8 @@ protected:
   virtual void open_single_part(const PathHierarchy &single_part) = 0;
   virtual void close_single_part() = 0;
   virtual ssize_t read_from_single_part(void *buffer, size_t size) = 0;
-  virtual int64_t seek_within_single_part(int64_t offset, int whence) = 0;
-  virtual int64_t size_of_single_part(const PathHierarchy &single_part) = 0;
+  virtual int64_t seek_within_single_part(int64_t offset, int whence);
+  virtual int64_t size_of_single_part(const PathHierarchy &single_part);
 
   PathHierarchy _logical_path;
   void deactivate_active_part();

data/ext/archive_r/vendor/archive_r/include/archive_r/path_hierarchy_utils.h

@@ -33,5 +33,4 @@ bool entry_name_from_component(const PathEntry &entry, std::string &output);
 std::string path_entry_display(const PathEntry &entry);
 std::string hierarchy_display(const PathHierarchy &hierarchy);
 
-
 } // namespace archive_r

data/ext/archive_r/vendor/archive_r/include/archive_r/platform_compat.h

@@ -6,16 +6,16 @@
 #include <sys/types.h>
 
 #if defined(_WIN32)
-#  include <sys/stat.h>
-#  include <BaseTsd.h>
-#  if !defined(_SSIZE_T_DEFINED)
+#include <BaseTsd.h>
+#include <sys/stat.h>
+#if !defined(_SSIZE_T_DEFINED)
 using ssize_t = SSIZE_T;
-#    define _SSIZE_T_DEFINED
-#  endif
-#  if !defined(_MODE_T_DEFINED)
+#define _SSIZE_T_DEFINED
+#endif
+#if !defined(_MODE_T_DEFINED)
 using mode_t = unsigned short; // MSVC does not expose POSIX mode_t by default
-#    define _MODE_T_DEFINED
-#  endif
+#define _MODE_T_DEFINED
+#endif
 #endif
 
 namespace archive_r {

data/ext/archive_r/vendor/archive_r/include/archive_r/traverser.h

@@ -75,8 +75,8 @@ public:
    * Provide one or more paths to traverse. Single-path traversal can be
    * achieved by passing a container with one element:
    *   Traverser traverser({make_single_path("archive.tar.gz")});
-  *
-  * @throws std::invalid_argument if paths is empty or contains an empty hierarchy
+   *
+   * @throws std::invalid_argument if paths is empty or contains an empty hierarchy
    */
   explicit Traverser(std::vector<PathHierarchy> paths, TraverserOptions options = {});
 

data/ext/archive_r/vendor/archive_r/src/archive_stack_cursor.cc

@@ -125,9 +125,7 @@ EntryPayloadStream::EntryPayloadStream(std::shared_ptr<StreamArchive> parent_arc
   }
 }
 
-EntryPayloadStream::~EntryPayloadStream() {
-  deactivate_active_part();
-}
+EntryPayloadStream::~EntryPayloadStream() { deactivate_active_part(); }
 
 std::shared_ptr<StreamArchive> EntryPayloadStream::parent_archive() const { return _parent_archive; }
 
@@ -154,19 +152,7 @@ void EntryPayloadStream::close_single_part() {
   // so explicit skipping here is unnecessary and avoids potential exceptions in destructor.
 }
 
-ssize_t EntryPayloadStream::read_from_single_part(void *buffer, size_t size) {
-  if (size == 0) {
-    return 0;
-  }
-  return _parent_archive->read_current(buffer, size);
-}
-
-int64_t EntryPayloadStream::seek_within_single_part(int64_t offset, int whence) { return -1; }
-
-int64_t EntryPayloadStream::size_of_single_part(const PathHierarchy &single_part) {
-  (void)single_part;
-  return -1;
-}
+ssize_t EntryPayloadStream::read_from_single_part(void *buffer, size_t size) { return _parent_archive->read_current(buffer, size); }
 
 // ============================================================================
 // ArchiveStackCursor Implementation
@@ -177,9 +163,7 @@ ArchiveStackCursor::ArchiveStackCursor()
     , _current_stream(nullptr)
     , _current_archive(nullptr) {}
 
-void ArchiveStackCursor::configure(const ArchiveOption &options) {
-  options_snapshot = options;
-}
+void ArchiveStackCursor::configure(const ArchiveOption &options) { options_snapshot = options; }
 
 void ArchiveStackCursor::reset() {
   options_snapshot = ArchiveOption{};
@@ -207,17 +191,12 @@ bool ArchiveStackCursor::descend() {
 }
 
 bool ArchiveStackCursor::ascend() {
-  if (depth() <= 0) {
+  if (!_current_archive) {
     return false;
   }
 
-  if (_current_archive) {
-    _current_stream = _current_archive->get_stream();
-    _current_archive = _current_archive->parent_archive();
-  } else {
-    _current_stream = nullptr;
-  }
-
+  _current_stream = _current_archive->get_stream();
+  _current_archive = _current_archive->parent_archive();
   return true;
 }
 
@@ -250,8 +229,7 @@ bool ArchiveStackCursor::synchronize_to_hierarchy(const PathHierarchy &target_hi
   // 1. Ascend until we find a common ancestor
   while (depth() > 0) {
     auto current_h = _current_archive->source_hierarchy();
-    if (current_h.size() <= target_hierarchy.size() &&
-        hierarchies_equal(current_h, pathhierarchy_prefix_until(target_hierarchy, current_h.size() - 1))) {
+    if (current_h.size() <= target_hierarchy.size() && hierarchies_equal(current_h, pathhierarchy_prefix_until(target_hierarchy, current_h.size() - 1))) {
       break;
     }
     ascend();
@@ -289,12 +267,10 @@ ssize_t ArchiveStackCursor::read(void *buff, size_t len) {
   return 0;
 }
 
-StreamArchive *ArchiveStackCursor::current_archive() {
-  return _current_archive.get();
-}
+StreamArchive *ArchiveStackCursor::current_archive() { return _current_archive.get(); }
 
 PathHierarchy ArchiveStackCursor::current_entry_hierarchy() {
-  if (depth() == 0 || (!_current_stream && !_current_archive)) {
+  if (!_current_stream && !_current_archive) {
     return {};
   }
 
@@ -306,7 +282,7 @@ PathHierarchy ArchiveStackCursor::current_entry_hierarchy() {
     return path;
   }
 
-  return _current_stream->source_hierarchy();
+  return _current_stream ? _current_stream->source_hierarchy() : PathHierarchy{};
 }
 
 std::shared_ptr<IDataStream> ArchiveStackCursor::create_stream(const PathHierarchy &hierarchy) {

data/ext/archive_r/vendor/archive_r/src/archive_stack_cursor.h

@@ -4,10 +4,10 @@
 #pragma once
 
 #include "archive_r/data_stream.h"
+#include "archive_r/multi_volume_stream_base.h"
 #include "archive_r/path_hierarchy.h"
 #include "archive_type.h"
 #include "entry_fault_error.h"
-#include "archive_r/multi_volume_stream_base.h"
 #include <array>
 #include <cstddef>
 #include <exception>
@@ -64,8 +64,6 @@ private:
   void open_single_part(const PathHierarchy &single_part) override;
   void close_single_part() override;
   ssize_t read_from_single_part(void *buffer, size_t size) override;
-  int64_t seek_within_single_part(int64_t offset, int whence) override;
-  int64_t size_of_single_part(const PathHierarchy &single_part) override;
 };
 
 // ============================================================================

data/ext/archive_r/vendor/archive_r/src/archive_stack_orchestrator.cc

@@ -2,8 +2,8 @@
 // Copyright (c) 2025 archive_r Team
 
 #include "archive_stack_orchestrator.h"
-#include "archive_r/path_hierarchy_utils.h"
 #include "archive_r/entry_fault.h"
+#include "archive_r/path_hierarchy_utils.h"
 #include "system_file_stream.h"
 
 #include <algorithm>
@@ -19,9 +19,8 @@
 namespace archive_r {
 
 ArchiveStackOrchestrator::ArchiveStackOrchestrator(const ArchiveOption &options)
-    : _archive_options(options)
-    , _metadata_keys(options.metadata_keys.begin(), options.metadata_keys.end()) {
-    _head.configure(_archive_options);
+    : _archive_options(options) {
+  _head.configure(_archive_options);
 }
 
 ArchiveStackOrchestrator::~ArchiveStackOrchestrator() = default;
@@ -135,12 +134,12 @@ void ArchiveStackOrchestrator::mark_entry_as_multi_volume(const PathHierarchy &e
 }
 
 bool ArchiveStackOrchestrator::descend_pending_multi_volumes() {
-  const PathHierarchy current_hierarchy = _head.current_entry_hierarchy();
+  const PathHierarchy current_hierarchy = (depth() == 0) ? PathHierarchy{} : _head.current_entry_hierarchy();
   PathHierarchy multi_volume_target;
   if (!_multi_volume_manager.pop_multi_volume_group(current_hierarchy, multi_volume_target)) {
     return false;
   }
-  
+
   _head.synchronize_to_hierarchy(multi_volume_target);
   _head.descend();
   return true;

data/ext/archive_r/vendor/archive_r/src/archive_stack_orchestrator.h

@@ -5,8 +5,8 @@
 
 #include "archive_r/path_hierarchy.h"
 #include "archive_r/platform_compat.h"
-#include "archive_type.h"
 #include "archive_stack_cursor.h"
+#include "archive_type.h"
 #include "entry_fault_error.h"
 #include "multi_volume_manager.h"
 #include <limits>
@@ -36,7 +36,7 @@ public:
   StreamArchive *current_archive();
   ssize_t read_head(void *buff, size_t len);
 
-  const std::unordered_set<std::string> &metadata_keys() const { return _metadata_keys; }
+  const std::unordered_set<std::string> &metadata_keys() const { return _archive_options.metadata_keys; }
   const ArchiveOption &options() const { return _archive_options; }
 
   void mark_entry_as_multi_volume(const PathHierarchy &entry_path, const std::string &base_name, PathEntry::Parts::Ordering ordering = PathEntry::Parts::Ordering::Natural);
@@ -44,7 +44,6 @@ public:
 
 private:
   ArchiveOption _archive_options;
-  std::unordered_set<std::string> _metadata_keys;
   ArchiveStackCursor _head;
   MultiVolumeManager _multi_volume_manager;
 

data/ext/archive_r/vendor/archive_r/src/archive_type.cc

@@ -232,9 +232,7 @@ bool Archive::search_forward_until_eof(const std::string &entryname) {
     if (current_entryname == entryname) {
       return true;
     }
-    if (!skip_data()) {
-      return false;
-    }
+    skip_data();
   }
   return false;
 }
@@ -247,9 +245,7 @@ bool Archive::search_until_position(const std::string &entryname, const std::str
     if (current_entryname == stop_position) {
       break;
     }
-    if (!skip_data()) {
-      return false;
-    }
+    skip_data();
   }
   return false;
 }
@@ -268,6 +264,7 @@ ssize_t Archive::read_current(void *buff, size_t len) {
   return bytes_read;
 }
 
+// Returns the current entry size in bytes, or 0 when no entry is selected.
 uint64_t Archive::current_entry_size() const {
   if (!current_entry) {
     return 0;
@@ -275,6 +272,7 @@ uint64_t Archive::current_entry_size() const {
   return archive_entry_size(current_entry);
 }
 
+// Returns the current entry filetype bits, or 0 when no entry is selected.
 mode_t Archive::current_entry_filetype() const {
   if (!current_entry) {
     return 0;
@@ -451,14 +449,9 @@ EntryMetadataMap Archive::current_entry_metadata(const std::unordered_set<std::s
     }
   }
 
-  ssize_t acl_length = 0;
-  char *acl_text = wants("acl_text") ? archive_entry_acl_to_text(current_entry, &acl_length, ARCHIVE_ENTRY_ACL_STYLE_SEPARATOR_COMMA) : nullptr;
+  char *acl_text = wants("acl_text") ? archive_entry_acl_to_text(current_entry, nullptr, ARCHIVE_ENTRY_ACL_STYLE_SEPARATOR_COMMA) : nullptr;
   if (acl_text) {
-    if (acl_length >= 0) {
-      metadata["acl_text"] = std::string(acl_text, static_cast<size_t>(acl_length));
-    } else {
-      metadata["acl_text"] = std::string(acl_text);
-    }
+    metadata["acl_text"] = std::string(acl_text);
     std::free(acl_text);
   }
 

data/ext/archive_r/vendor/archive_r/src/archive_type.h

@@ -26,9 +26,9 @@ using archive_ptr = std::unique_ptr<struct archive, archive_deleter>;
 using open_delegate = std::function<int(struct archive *ar)>;
 
 struct ArchiveOption {
-  std::vector<std::string> passphrases;   ///< Passphrases for encrypted archives
-  std::vector<std::string> formats;       ///< Specific format names to enable (empty = all)
-  std::vector<std::string> metadata_keys; ///< Metadata keys to capture (empty = none)
+  std::vector<std::string> passphrases;          ///< Passphrases for encrypted archives
+  std::vector<std::string> formats;              ///< Specific format names to enable (empty = all)
+  std::unordered_set<std::string> metadata_keys; ///< Metadata keys to capture (empty = none)
 };
 
 archive_ptr new_read_archive_common(const std::vector<std::string> &passphrases, const std::vector<std::string> &format_names, open_delegate archive_open);

data/ext/archive_r/vendor/archive_r/src/entry.cc

@@ -32,24 +32,9 @@ Entry::Impl::Impl(const Impl &other)
     , _descend_enabled(other._descend_enabled)
     , _orchestrator(nullptr)
     , _shares_traverser_orchestrator(false)
-    , _archive_options(other._archive_options) {
-}
+    , _archive_options(other._archive_options) {}
 
 // Copy assignment operator
-Entry::Impl &Entry::Impl::operator=(const Impl &other) {
-  if (this != &other) {
-    _path_hierarchy = other._path_hierarchy;
-    _size = other._size;
-    _filetype = other._filetype;
-    _metadata = other._metadata;
-    _descend_enabled = other._descend_enabled;
-    _orchestrator.reset();
-    _shares_traverser_orchestrator = false;
-    _archive_options = other._archive_options;
-  }
-  return *this;
-}
-
 Entry::Impl::Impl(const PathHierarchy &hierarchy, std::shared_ptr<ArchiveStackOrchestrator> data_source_orchestrator, bool default_descent)
     : _path_hierarchy(hierarchy)
     , _size(0)
@@ -199,7 +184,7 @@ ssize_t Entry::Impl::read(void *buffer, size_t length) {
 // ============================================================================
 
 Entry::Entry(const PathHierarchy &hierarchy, std::shared_ptr<ArchiveStackOrchestrator> data_source_orchestrator, bool default_descent)
-  : _impl(std::make_unique<Impl>(hierarchy, std::move(data_source_orchestrator), default_descent)) {}
+    : _impl(std::make_unique<Impl>(hierarchy, std::move(data_source_orchestrator), default_descent)) {}
 
 Entry::Entry(Impl *impl)
     : _impl(impl) {}