From f47ef9ee46984d039211c8ff4644753c454b75de Mon Sep 17 00:00:00 2001 From: "Caleb J. Gardner" Date: Wed, 17 Jun 2026 22:30:53 -0500 Subject: [PATCH] Fixed a couple stupid mistakes --- src/extract-single.zig | 9 --------- src/meta_rdr.zig | 1 + src/test.zig | 4 ++-- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/extract-single.zig b/src/extract-single.zig index 3facbed..feacbd1 100644 --- a/src/extract-single.zig +++ b/src/extract-single.zig @@ -92,9 +92,6 @@ fn extractDir( path: []const u8, options: ExtractionOptions, ) !void { - std.debug.print("starting extract dir: {s}\n", .{path}); - defer std.debug.print("end extract dir: {s}\n", .{path}); - var xattr_idx: ?u32 = null; try Io.Dir.cwd().createDirPath(io, path); @@ -149,8 +146,6 @@ fn extractFile( path: []const u8, options: ExtractionOptions, ) !void { - std.debug.print("starting extract file: {s}\n", .{path}); - defer std.debug.print("end extract file: {s}\n", .{path}); var xattr_idx: ?u32 = null; var rdr: DataReader = switch (inode.data) { @@ -201,8 +196,6 @@ fn extractFile( try setMetadata(alloc, io, id_table, xattr_table, inode, path, options, xattr_idx); } fn extractSymlink(io: Io, inode: Inode, path: []const u8) !void { - std.debug.print("starting extract symlink: {s}\n", .{path}); - defer std.debug.print("end extract symlink: {s}\n", .{path}); return switch (inode.data) { .symlink => |s| Io.Dir.cwd().symLink(io, s.target, path, .{}), .ext_symlink => |s| Io.Dir.cwd().symLink(io, s.target, path, .{}), @@ -218,8 +211,6 @@ fn extractNod( path: []const u8, options: ExtractionOptions, ) !void { - std.debug.print("starting extract nod: {s}\n", .{path}); - defer std.debug.print("end extract nod: {s}\n", .{path}); var dev: u32 = 0; var mode: u32 = undefined; diff --git a/src/meta_rdr.zig b/src/meta_rdr.zig index 1a19a71..6ce84e8 100644 --- a/src/meta_rdr.zig +++ b/src/meta_rdr.zig @@ -98,6 +98,7 @@ fn readVec(r: *Reader, vec: [][]u8) Reader.Error!usize { @memcpy(v[0..to_cpy], r.buffer[r.seek..][0..to_cpy]); wrote += to_cpy; + r.seek += to_cpy; if (r.seek >= r.end) break; } diff --git a/src/test.zig b/src/test.zig index 0b11f91..5e92c68 100644 --- a/src/test.zig +++ b/src/test.zig @@ -67,7 +67,7 @@ test "ExtractCompleteArchiveSingleThreadedOption" { const io = testing.io; const alloc = testing.allocator; - Io.Dir.cwd().deleteFile(io, TestFullExtractLocationSTOption) catch {}; + Io.Dir.cwd().deleteTree(io, TestFullExtractLocationSTOption) catch {}; var archive_file = try Io.Dir.cwd().openFile(io, TestArchive, .{}); defer archive_file.close(io); @@ -84,7 +84,7 @@ test "ExtractCompleteArchiveMultiThreaded" { const io = testing.io; const alloc = testing.allocator; - Io.Dir.cwd().deleteFile(io, TestFullExtractLocationMT) catch {}; + Io.Dir.cwd().deleteTree(io, TestFullExtractLocationMT) catch {}; var archive_file = try Io.Dir.cwd().openFile(io, TestArchive, .{}); defer archive_file.close(io);