omnizip 0.3.38 → 0.3.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67142de350c2f3dd29c473268977799ed088cedb0340932cff6db7bc23ac009e
-  data.tar.gz: c35fbc3353ca0c20f2ec4f86fa39fff67e6ed95822702a18c9b545d35406749c
+  metadata.gz: 8f86f08dba1d67ec9a22053ee355dda5d461c42d29b45134ad75a1192584d0a5
+  data.tar.gz: 31d78c577804b43509bfea9a8bc9fd5edfad4ac149752cabb0eef87eafebbf56
 SHA512:
-  metadata.gz: 7f6b4e88bb0a227f7cff47b06e979891e6d5a57288ae141bd15e57a07abe2cef3c915600242bb05406c4b7a13ef9fdd0ab5f11870e41b65f0a95077191741ceb
-  data.tar.gz: 3e8497c8eb222b4a139f965ec84f1672d8b12ae92e55986df95d8057c452bcace18a75c54a0464ca696776a33256d2e11ea53811c7d73e3ecb1c0eece06d04ff
+  metadata.gz: f6ee4bb68ede247277420ec455130140a8be8e1f417581f1c3f996cab48d34202ae26631862ef88ef301fb712c649f72100805c6d553afce51f2705747e68e28
+  data.tar.gz: b7f3567b7f8d3c7679bbd7563fd9fabf666aa3c1fbfdff38afd0e9e2dc9034e1f78428b710f2ff72518e45eef956eeb61a679c27df6b00e2a8e81cbbc0b5eed1

data/CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.3.38] - 2026-08-28
+
 ### Added
 - `.cpio` and `.iso` read routing: `extract_archive`/`list_archive`/
   `read_from_archive`/`Archive.open` operate on CPIO archives and ISO

data/README.adoc

@@ -115,13 +115,14 @@ Omnizip provides complete XZ container format (`.xz`) support with LZMA2 compres
 ----
 require 'omnizip'
 
-# Compress to XZ format
-compressed = Omnizip::Formats::Xz.compress("Hello, World!")
-File.write('output.xz', compressed)
+# Compress a file to XZ format
+Omnizip::Formats::Xz.create_file('input.txt', level: 6)
 
-# Decompress from XZ format
-compressed_data = File.read('output.xz')
-decompressed = Omnizip::Formats::Xz.decompress(compressed_data)
+# Compress in-memory data (returns the .xz bytes)
+compressed = Omnizip::Formats::Xz.create("Hello, World!")
+
+# Decompress (accepts a path or the .xz bytes)
+decompressed = Omnizip::Formats::Xz.decompress(compressed)
 
 # Or use the Reader API
 reader = Omnizip::Formats::Xz::Reader.new('file.xz')
@@ -133,7 +134,7 @@ data = reader.read
 [source,ruby]
 ----
 # Configure checksum type
-compressed = Omnizip::Formats::Xz.compress(data, check_type: :crc64)
+compressed = Omnizip::Formats::Xz.create(data, check_type: :crc64)
 # Options: :crc32 (default), :crc64, :sha256, :none
 
 # Using Builder API for multi-part data
@@ -216,19 +217,19 @@ Omnizip provides complete 7-Zip container format (`.7z`) support with multiple c
 require 'omnizip'
 
 # Create 7z archive
-Omnizip::Formats::SevenZip::Writer.create('archive.7z') do |sz|
+Omnizip::Formats::SevenZip.create('archive.7z') do |sz|
   sz.add_file('document.pdf')
   sz.add_directory('photos/')
 end
 
 # Extract 7z archive
-Omnizip::Formats::SevenZip::Reader.open('archive.7z') do |sz|
+Omnizip::Formats::SevenZip.open('archive.7z') do |sz|
   sz.extract_all('output/')
 end
 
 # List contents
-Omnizip::Formats::SevenZip::Reader.open('archive.7z') do |sz|
-  sz.entries.each do |entry|
+Omnizip::Formats::SevenZip.open('archive.7z') do |sz|
+  sz.list_files.each do |entry|
     puts "#{entry.name}: #{entry.size} bytes"
   end
 end
@@ -239,7 +240,7 @@ end
 [source,ruby]
 ----
 # With compression options
-Omnizip::Formats::SevenZip::Writer.create('archive.7z',
+Omnizip::Formats::SevenZip.create('archive.7z',
   algorithm: :lzma2,
   level: 9,
   solid: true
@@ -248,9 +249,9 @@ Omnizip::Formats::SevenZip::Writer.create('archive.7z',
 end
 
 # With password encryption
-Omnizip::Formats::SevenZip::Writer.create('secure.7z',
+Omnizip::Formats::SevenZip.create('secure.7z',
   password: 'secret123',
-  encrypt_header: true
+  encrypt_headers: true
 ) do |sz|
   sz.add_file('confidential.doc')
 end
@@ -417,39 +418,23 @@ puts "#{info[:name]}-#{info[:version]}-#{info[:release]}"
 ----
 require 'omnizip'
 
-# Create RPM package with gzip compression (default)
-Omnizip::Formats::Rpm.write('mypackage-1.0-1.noarch.rpm') do |rpm|
-  rpm.name = 'mypackage'
-  rpm.version = '1.0'
-  rpm.release = '1'
-  rpm.arch = 'noarch'
-  rpm.summary = 'My awesome package'
-  rpm.description = 'A longer description of the package'
-  rpm.license = 'MIT'
-  rpm.vendor = 'My Company'
-  rpm.url = 'https://example.com/mypackage'
-
-  # Add files from filesystem
-  rpm.add_file('/usr/bin/myapp', 'path/to/myapp')
-  rpm.add_file('/etc/myapp.conf', 'path/to/config')
-  rpm.add_directory('/var/lib/myapp')
-
-  # Add dependencies
-  rpm.add_dependency('glibc', '>= 2.17')
-  rpm.add_provides('myapp')
-end
+# Create RPM package with gzip-compressed payload (default)
+rpm = Omnizip::Formats::Rpm::Writer.new(
+  name: 'mypackage', version: '1.0', release: '1', arch: 'noarch'
+)
 
-# Create RPM with different compression
-Omnizip::Formats::Rpm.write('mypackage-1.0-1.x86_64.rpm',
-                            compression: :xz) do |rpm|
-  rpm.name = 'mypackage'
-  rpm.version = '1.0'
-  rpm.release = '1'
-  rpm.arch = 'x86_64'
-  # ... add files
-end
+# Add payload entries (content is passed as a string)
+rpm.add_file('/usr/bin/myapp', File.binread('path/to/myapp'), mode: 0o755)
+rpm.add_file('/etc/myapp.conf', File.binread('path/to/config'))
+rpm.add_directory('/var/lib/myapp')
+
+rpm.write('mypackage-1.0-1.noarch.rpm')
 
 # Supported compression types: :gzip (default), :bzip2, :xz, :zstd, :none
+Omnizip::Formats::Rpm::Writer.new(
+  name: 'mypackage', version: '1.0', release: '1',
+  arch: 'x86_64', compression: :xz
+)
 ----
 
 **Architecture**:
@@ -544,8 +529,8 @@ See link:readme-docs/preprocessing-filters.adoc[Preprocessing Filters Guide] for
 
 * **.7z** - Full read/write with solid compression, multi-volume support
 * **ZIP** - Full read/write with ZIP64, WinZip AES encryption
-* **RAR4** - Full read support with all compression methods, write support with STORE, FASTEST, NORMAL (v0.3.0)
-* **RAR5** - Full read/write support with STORE and LZMA compression, multi-volume, solid archives (v0.3.0)
+* **RAR4** - Read support for real WinRAR archives (STORE natively; compressed methods via unrar), write with STORE verified against unrar, FASTEST through BEST for Omnizip round-trip (v0.3.0)
+* **RAR5** - Read/write with STORE (unrar-verified), AES-256 encryption, multi-volume; compressed-method writing falls back to STORE (v0.3.0)
 * **TAR** - Full read/write with POSIX extensions
 * **ISO 9660** - Full read/write with Rock Ridge/Joliet
 * **CPIO** - Full read/write (newc, CRC formats) with RPM payload support (v0.4.0)
@@ -679,16 +664,19 @@ File.open('input.txt', 'rb') do |input|
 end
 
 # .7z archive operations
-writer = Omnizip::Formats::SevenZip::Writer.new('archive.7z')
-writer.add_file('document.pdf')
-writer.close
+Omnizip::Formats::SevenZip.create('archive.7z') do |sz|
+  sz.add_file('document.pdf')
+end
 ----
 
 ==== RAR Archives
 
 ==== RAR4 Archives (v0.3.0)
 
-Omnizip v0.3.0 provides complete RAR4 archive support with full read capabilities and write support for three compression methods:
+RAR4 reading and writing against the on-disk format unrar accepts:
+headers carry the low 16 bits of a CRC32, HEAD_SIZE counts the whole
+block, and the dictionary mask 0xE0 marks directory entries. STORE
+archives round-trip through official unrar byte-identically.
 
 ====== Reading RAR4 Archives
 
@@ -696,31 +684,29 @@ Omnizip v0.3.0 provides complete RAR4 archive support with full read capabilitie
 ----
 require 'omnizip'
 
-# Read RAR4 archive with native decompression
-reader = Omnizip::Formats::Rar3::Reader.new
-File.open('archive.rar', 'rb') do |io|
-  entries = reader.read_archive(io)
+reader = Omnizip::Formats::Rar::Reader.new('archive.rar')
+reader.open
 
-  # List files with metadata
-  entries.each do |entry|
-    puts "#{entry.name}: #{entry.uncompressed_size} bytes (#{entry.compressed_size} compressed)"
-    puts "  Method: #{entry.compression_method}"
-    puts "  Modified: #{entry.modified_time}"
-    puts "  Directory: #{entry.is_directory}"
-  end
+reader.list_files.each do |entry|
+  puts "#{entry.name}: #{entry.size} bytes (#{entry.compressed_size} compressed)"
+  puts "  Directory: #{entry.is_dir}"
+  puts "  Modified: #{entry.mtime}"
 end
+
+# STORE data decodes natively; WinRAR-compressed entries fall back to
+# the unrar command after a CRC check rejects foreign streams
+reader.extract_entry('test.txt', 'output/test.txt')
+reader.extract_all('output/')
 ----
 
 **RAR4 Reader Features:**
 
-* ✅ All compression methods: STORE, FASTEST, FAST, NORMAL, GOOD, BEST
-* ✅ Proper block header parsing (FILE blocks, archive headers)
-* ✅ Minimal archive support (archives without archive header)
-* ✅ Unicode filename support
-* ✅ Symlink detection and handling
+* ✅ Block header parsing (MAIN/FILE/ENDARC), directories, empty files
+* ✅ Native STORE decompression with stored-CRC32 verification
+* ✅ unrar fallback for real WinRAR-compressed entries (byte-exact)
+* ✅ DOS-style backslash name normalization to forward slashes
 * ✅ Multi-volume archive detection
-* ✅ Graceful error handling for truncated/malformed files
-* ✅ libarchive compatibility (52 test files verified)
+* ✅ Parsing verified against libarchive WinRAR fixtures
 
 ====== Writing RAR4 Archives
 
@@ -728,141 +714,123 @@ end
 ----
 require 'omnizip'
 
-# Create RAR4 archive with default compression (NORMAL)
-writer = Omnizip::Formats::Rar::Writer.new('archive.rar')
+# STORE output is verified interoperable with unrar
+writer = Omnizip::Formats::Rar::Writer.new('archive.rar',
+  compression: :store
+)
 writer.add_file('document.txt')
 writer.add_file('image.png')
 writer.add_directory('photos/')
 writer.write
-writer.close
-
-# Or use block syntax
-Omnizip::Formats::Rar::Writer.new('archive.rar') do |rar|
-  rar.add_file('document.txt')
-  rar.add_directory('photos/')
-end
-
-# Select compression method
-writer = Omnizip::Formats::Rar::Writer.new('archive.rar',
-  compression_method: :normal  # or :store, :fastest
-)
-writer.add_file('large_file.bin')
-writer.write
 ----
 
+Writer options: `compression:` (see below), `test_after_create: true`
+(reads the archive back and verifies every file). RAR4 encryption is
+not implemented — `password:` raises `NotImplementedError`. The
+`solid:`/`recovery:`/`volume_size:` options are accepted but not
+implemented; they are ignored with a warning and never advertised in
+header flags.
+
 ====== RAR4 Compression Methods
 
 [cols="2,2,2,4",options="header"]
 |===
-|Method |Speed |Ratio |Status
-|`:store` |Instant |1.0x |✅ Fully working
-|`:fastest` |Very Fast |2-3x |✅ Fully working
-|`:normal` |Fast |3-5x |✅ Fully working (default)
-|`:best` |Slow |5-10x |⚠️ Known issues (v0.3.1)
+|Method |Speed |unrar interop |Notes
+|`:store` |Instant |✅ verified |Byte-identical round-trip incl. directories
+|`:fastest` |Very Fast |❌ Omnizip-only |LZ77+Huffman, readable by Omnizip
+|`:normal` (default) |Fast |❌ Omnizip-only |LZ77+Huffman, readable by Omnizip
+|`:good` |Medium |❌ Omnizip-only |LZ77+Huffman, readable by Omnizip
+|`:best` |Slow |❌ Omnizip-only |PPMd, readable by Omnizip
 |===
 
+Official RAR LZ/PPMd streams are proprietary; methods above `:store`
+produce archives Omnizip can read back but unrar reports as checksum
+errors. Use `:store` for interoperability.
+
 ===== RAR5 Archives (v0.3.0)
 
-Full read/write support for RAR5 archives with STORE and LZMA compression, including optional fields (mtime, CRC32).
+Read/write support for RAR5 archives with STORE compression,
+AES-256 encryption, and multi-volume archives — all verified against
+official unrar.
 
 ====== Reading RAR5 Archives
 
 [source,ruby]
 ----
-require 'omnizip/formats/rar5/reader'
+require 'omnizip'
 
-# Read RAR5 archive
 reader = Omnizip::Formats::Rar5::Reader.new
 File.open('archive.rar', 'rb') do |io|
   entries = reader.read_archive(io)
 
-  # List files with metadata
   entries.each do |entry|
     puts "#{entry.name}: #{entry.uncompressed_size} bytes"
-    puts "  Method: #{entry.compression_method}"
-    puts "  CRC32: #{entry.crc32.to_s(16)}"
-    puts "  Modified: #{entry.modified_time}"
+    puts "  CRC32: #{entry.crc32.to_s(16)}" if entry.crc32
+    puts "  Modified: #{entry.modified_time}" if entry.modified_time
   end
 end
 ----
 
 **RAR5 Reader Features:**
 
-* ✅ All compression methods: STORE, LZSS (methods 0-5)
-* ✅ Solid archive support
+* ✅ STORE file data, header CRC32 verification
+* ✅ 32-bit Unix mtime decoding (matches unrar; nil when absent)
 * ✅ Unicode filenames (UTF-8)
-* ✅ Symlink and hardlink support
 * ✅ Multi-file archives
 * ✅ VInt (variable-length integer) parsing
-* ✅ Proper header tracking with bounds checking
 * ✅ Graceful error handling for truncated/invalid files
-* ✅ libarchive compatibility (51 test files verified)
+* ✅ libarchive compatibility fixtures
 
 ====== Writing RAR5 Archives
 
 [source,ruby]
 ----
-require 'omnizip/formats/rar/rar5/writer'
+require 'omnizip'
 
-# Create RAR5 archive with STORE compression (default)
+# STORE compression (default) — unrar-verified
 writer = Omnizip::Formats::Rar::Rar5::Writer.new('archive.rar')
 writer.add_file('document.txt')
 writer.add_file('image.png')
 writer.write
 
-# LZMA compression with level selection
+# AES-256 encryption
 writer = Omnizip::Formats::Rar::Rar5::Writer.new('archive.rar',
-  compression: :lzma,
-  level: 5  # 1=fastest, 3=normal, 5=best
+  password: 'secret'
 )
 writer.add_file('data.json')
 writer.write
 
-# Auto-select compression based on file size
+# Multi-volume archives split at 64 KB boundaries
 writer = Omnizip::Formats::Rar::Rar5::Writer.new('archive.rar',
-  compression: :auto,  # < 1KB → STORE, ≥ 1KB → LZMA
-  level: 3
+  multi_volume: true,
+  volume_size: 65536
 )
-writer.add_file('small.txt')
-writer.add_file('large.dat')
-writer.write
+writer.add_file('big1.bin')
+writer.add_file('big2.bin')
+writer.write   # writes archive.part1.rar, archive.part2.rar, ...
 ----
 
 ====== RAR5 Compression Methods
 
-[cols="2,2,3,3",options="header"]
+[cols="2,2,4",options="header"]
 |===
-|Method |Level |Dictionary |Status
-|`:store` |0 |None |✅ Uncompressed passthrough
-|`:lzma` |1 |256 KB |✅ LZMA fastest
-|`:lzma` |2 |1 MB |✅ LZMA fast
-|`:lzma` |3 |4 MB |✅ LZMA normal (default)
-|`:lzma` |4 |8 MB |✅ LZMA good
-|`:lzma` |5 |16 MB |✅ LZMA best
+|Method |Interop |Notes
+|`:store` (default) |✅ unrar-verified |Uncompressed passthrough
+|`:lzss` / `:lzma` |falls back to STORE |Encoder is not official-RAR compatible; warns and stores
+|`:auto` |STORE |Size-based selection
 |===
 
-====== RAR5 Features
-
-**Implemented (v0.3.0):**
-
-* ✅ **STORE compression** - Uncompressed storage (method 0)
-* ✅ **LZMA compression** - 5 compression levels (methods 1-5) - *SDK-compatible encoder*
-* ✅ **Auto compression** - Smart selection based on file size
-* ✅ **Multi-volume archives** - Split archives across multiple volumes
-* ✅ **Solid compression** - 10-30% better compression for similar files
-* ✅ **AES-256 encryption** - Password protection with PBKDF2-HMAC-SHA256
-* ✅ **PAR2 recovery records** - Error correction with Reed-Solomon codes
-* ✅ **Optional fields** - Modification time (mtime), CRC32 checksums
-* ✅ **Pure Ruby** - Zero external dependencies
-* ✅ **LZMA SDK compatibility** - Encoder produces byte-for-byte identical output to reference implementation
-* ✅ **Full reader support** - All compression methods, solid archives, unicode, symlinks
+====== RAR5 Optional Fields
 
-**CRC32 Limitation:**
+The writer can embed metadata that readers use without decompressing:
 
-* ⚠️ **CRC32 checksums** - Only compatible with STORE compression
-  - When LZMA compression is used, CRC32 is automatically disabled
-  - This is a RAR5 format limitation, not an implementation issue
-  - Use BLAKE2sp (always enabled) for compressed file integrity
+[source,ruby]
+----
+writer = Omnizip::Formats::Rar::Rar5::Writer.new('archive.rar',
+  include_mtime: true,   # 32-bit Unix mtime per file header
+  include_crc32: true    # CRC32 per file header
+)
+----
 
 ====== RAR5 Optional Fields
 

data/config/formats/rar3_spec.yml

@@ -45,6 +45,7 @@ format:
     version: 0x0800          # Version flag
     ext_time: 0x1000         # Extended time field present
     ext_flags: 0x2000        # Extended flags field
+    long_block: 0x8000       # Block carries a data area (PACK_SIZE)
 
   compression_methods:
     store: 0x30              # No compression

data/lib/omnizip/formats/rar/block_parser.rb

@@ -76,6 +76,9 @@ module Omnizip
           # Read file name
           name_bytes = io.read(name_size)
           entry.name = decode_filename(name_bytes, head_flags)
+          # RAR4 archives store DOS-style backslash separators;
+          # normalize to forward slashes like unrar on Unix.
+          entry.name = entry.name.tr("\\", "/")
 
           # Set entry properties
           entry.size = unpack_size
@@ -88,18 +91,25 @@ module Omnizip
           entry.attributes = attr
           entry.mtime = dos_time_to_time(file_time)
 
-          # Set flags
-          entry.is_dir = head_flags.anybits?(FILE_DIRECTORY)
+          # Set flags. RAR4 directory entries carry the full
+          # dictionary mask 0xE0 in HEAD_FLAGS (a directory has no
+          # dictionary); the exact match avoids misreading a large
+          # dictionary size on files as the marker.
+          entry.is_dir = head_flags.allbits?(FILE_DIRECTORY)
+          # WinRAR writes directory names with a trailing backslash;
+          # normalize it away for host paths.
+          entry.name = entry.name.chomp("\\") if entry.is_dir
           entry.encrypted = head_flags.anybits?(FILE_ENCRYPTED)
           entry.split_before = head_flags.anybits?(FILE_SPLIT_BEFORE)
           entry.split_after = head_flags.anybits?(FILE_SPLIT_AFTER)
 
-          # Skip remaining header data and file data
-          # Fixed fields: TYPE(1) + FLAGS(2) + SIZE(2) + PACK_SIZE(4) + UNPACK_SIZE(4) +
-          #               HOST_OS(1) + FILE_CRC(4) + FILE_TIME(4) + VERSION(1) + METHOD(1) +
-          #               NAME_SIZE(2) + ATTR(4) = 30 bytes
-          remaining = head_size - (name_size + 30)
-          remaining += 8 if head_flags.anybits?(FILE_LARGE)
+          # Skip remaining header data and file data. HEAD_SIZE
+          # counts the whole block including the 2-byte HEAD_CRC;
+          # consumed so far: 2 (CRC) + 30 (fixed fields) + name, plus
+          # 8 more when high-size words were present. Leftover bytes
+          # cover salt/extra time fields without interpreting them.
+          remaining = head_size - (name_size + 32)
+          remaining -= 8 if head_flags.anybits?(FILE_LARGE)
           io.read(remaining) if remaining.positive?
           io.read(pack_size) # Skip compressed data
 

data/lib/omnizip/formats/rar/constants.rb

@@ -21,6 +21,10 @@ module Omnizip
         BLOCK_SUBBLOCK = 0x7A
         BLOCK_ENDARC = 0x7B
 
+        # HEAD_FLAGS bit 0x8000 (LONG_BLOCK): the block carries a
+        # data area whose size is the PACK_SIZE field at offset 7
+        BLOCK_LONG = 0x8000
+
         # Archive flags
         ARCHIVE_VOLUME = 0x0001
         ARCHIVE_COMMENT = 0x0002

data/lib/omnizip/formats/rar/decompressor.rb

@@ -152,7 +152,7 @@ module Omnizip
                 "WinRAR", "UnRAR.exe"
               ),
             ].each do |path|
-              return "\"#{path}\"" if File.exist?(path)
+              return path if File.exist?(path)
             end
 
             nil
@@ -176,7 +176,7 @@ module Omnizip
           def command_version
             return nil unless command_available?
 
-            output = `#{command_path} 2>&1`
+            output = `"#{command_path}" 2>&1`
             output.match(/UNRAR\s+([\d.]+)/i)&.captures&.first || "unknown"
           end
 
@@ -191,7 +191,7 @@ module Omnizip
           # Extract with system command
           def extract_with_command(archive_path, output_dir, password)
             cmd = build_extract_command(archive_path, output_dir, password)
-            return if system(cmd)
+            return if system(*cmd)
 
             raise "Command extraction failed: #{archive_path}"
           end
@@ -215,7 +215,7 @@ module Omnizip
 
           # List with system command
           def list_with_command(archive_path)
-            output = `#{command_path} vb "#{archive_path}" 2>&1`
+            output = `"#{command_path}" vb "#{archive_path}" 2>&1`
             raise "Command listing failed" unless $CHILD_STATUS.success?
 
             output.split("\n").map do |line|
@@ -240,7 +240,7 @@ module Omnizip
                                          output_path, password)
             temp_dir = Dir.mktmpdir
             cmd = build_extract_command(archive_path, temp_dir, password)
-            unless system(cmd)
+            unless system(*cmd)
               raise "Command entry extraction failed: #{entry_name}"
             end
 
@@ -252,9 +252,13 @@ module Omnizip
 
           # Build extract command
           def build_extract_command(archive_path, output_dir, password)
-            cmd = "#{command_path} x -y"
-            cmd += " -p#{password}" if password
-            cmd += " \"#{archive_path}\" \"#{output_dir}/\""
+            # Array form: no shell involved, so paths and passwords
+            # with special characters stay literal. -idq silences the
+            # per-file progress banner.
+            cmd = [command_path, "x", "-idq", "-y"]
+            cmd << "-p#{password}" if password
+            cmd << archive_path
+            cmd << "#{output_dir}/"
             cmd
           end
 

data/lib/omnizip/formats/rar/header.rb

@@ -84,20 +84,12 @@ module Omnizip
 
         # Parse RAR4 header
         #
+        # The 7-byte signature consumed by #parse IS the marker
+        # block, so the main header follows immediately.
+        #
         # @param io [IO] Input stream
         def parse_rar4_header(io)
-          # Read marker block
-          read_uint16(io)
-          head_type = io.read(1)&.ord
-          read_uint16(io)
-          read_uint16(io)
-
-          unless head_type == BLOCK_MARKER
-            raise "Expected marker block, got 0x#{head_type.to_s(16)}"
-          end
-
-          # Read archive header
-          read_uint16(io)
+          read_uint16(io) # HEAD_CRC
           head_type = io.read(1)&.ord
           head_flags = read_uint16(io)
           head_size = read_uint16(io)
@@ -112,9 +104,9 @@ module Omnizip
           @is_locked = head_flags.anybits?(ARCHIVE_LOCKED)
           @comment_present = head_flags.anybits?(ARCHIVE_COMMENT)
 
-          # Skip rest of archive header
-          # head_size includes TYPE(1) + FLAGS(2) + SIZE(2) = 5 bytes already read
-          remaining = head_size - 5
+          # Skip rest of archive header. HEAD_SIZE counts the whole
+          # block including the 2 HEAD_CRC bytes; 7 bytes consumed.
+          remaining = head_size - 7
           io.read(remaining) if remaining.positive?
         end
 

data/lib/omnizip/formats/rar/reader.rb

@@ -2,6 +2,7 @@
 
 require "fileutils"
 require "stringio"
+require "zlib"
 
 module Omnizip
   module Formats
@@ -246,11 +247,7 @@ module Omnizip
           # Native decompression only for RAR4 for now
           return false unless @header.version == 4
 
-          # Check if we have the compression method
-          return false if entry.nil? || entry.method.nil?
-
-          # All RAR4 methods are supported by our Dispatcher
-          true
+          !entry.nil? && !entry.method.nil?
         end
 
         # Extract entry using native decompression
@@ -258,17 +255,24 @@ module Omnizip
         # @param entry [Models::RarEntry] File entry
         # @param output_path [String] Destination path
         def extract_entry_native(entry, output_path)
-          # Read compressed data from archive
           compressed_data = read_compressed_data(entry)
-
-          # Decompress using Dispatcher
-          File.open(output_path, "wb") do |output|
-            # For now, assume METHOD_STORE (0x30)
-            # Real implementation would get method from entry
-            method = entry.method || 0x30
-
-            Compression::Dispatcher.decompress(method, compressed_data, output)
+          method = entry.method || 0x30
+
+          output = StringIO.new(+"")
+          Compression::Dispatcher.decompress(method, compressed_data, output)
+
+          # The native LZ/PPMd decoders understand Omnizip's own
+          # encoder output, not official RAR streams — without this
+          # check, real WinRAR archives would silently extract as
+          # garbage. The header CRC is authoritative: on mismatch,
+          # fall back to unrar.
+          data = output.string
+          if entry.crc && Zlib.crc32(data) != entry.crc
+            raise Compression::DecompressionError,
+                  "CRC mismatch for #{entry.name}"
           end
+
+          File.binwrite(output_path, data)
         rescue StandardError => e
           # Fall back to external decompressor on error
           warn "Native decompression failed for #{entry.name}: #{e.message}"