Belac/zig-squashfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed table reading

Browse Source
This commit is contained in:
Caleb Gardner
2025-05-21 20:35:45 -05:00
parent 41a6b0d6f3
commit e91d75458e
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/table.zig
+5 -7
View File
@@ -14,7 +14,6 @@ pub fn Table(
return struct { return struct {
alloc: std.mem.Allocator, alloc: std.mem.Allocator,
decomp: DecompressType, decomp: DecompressType,
holder: *FileHolder,
table: []T = &[0]T{}, table: []T = &[0]T{},
offset: u64, offset: u64,
item_count: u32, item_count: u32,
@@ -23,7 +22,6 @@ pub fn Table(
return .{ return .{
.alloc = read.alloc, .alloc = read.alloc,
.decomp = read.super.decomp, .decomp = read.super.decomp,
.holder = &read.holder,
.offset = offset, .offset = offset,
.item_count = item_count, .item_count = item_count,
}; };
@@ -32,17 +30,17 @@ pub fn Table(
alloc.free(self.table); alloc.free(self.table);
} }
pub fn getValue(self: *Self, i: u64) !T { pub fn getValue(self: *Self, read: *Reader, i: u64) !T {
if (i >= self.item_count) return TableError.InvalidIndex; if (i >= self.item_count) return TableError.InvalidIndex;
if (self.table.len - 1 > i) return self.table[i]; if (self.table.len > i) return self.table[i];
var meta_rdr: MetadataReader = undefined; var meta_rdr: MetadataReader = undefined;
var offset_rdr: FileOffsetReader = undefined; var offset_rdr: FileOffsetReader = undefined;
var meta_offset: u64 = 0; var meta_offset: u64 = 0;
var to_read: u32 = 0; var to_read: u32 = 0;
while (self.table.len < i) { while (self.table.len <= i) {
_ = try self.holder.file.preadAll(std.mem.sliceAsBytes(&meta_offset), self.offset); _ = try read.holder.file.preadAll(std.mem.sliceAsBytes(&meta_offset), self.offset);
self.offset += 8; self.offset += 8;
offset_rdr = self.holder.readerAt(meta_offset); offset_rdr = read.holder.readerAt(meta_offset);
meta_rdr = .init(self.alloc, self.decomp, offset_rdr.any()); meta_rdr = .init(self.alloc, self.decomp, offset_rdr.any());
defer meta_rdr.deinit(); defer meta_rdr.deinit();
to_read = @min(self.item_count - self.table.len, comptime blk: { to_read = @min(self.item_count - self.table.len, comptime blk: {