Skip to content

std.tar: support pax headers and gnu_long{name,link} #15382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/std/compress.zig
Original file line number Diff line number Diff line change
@@ -46,4 +46,5 @@ test {
_ = xz;
_ = zlib;
_ = zstd;
_ = @import("compress/tar.zig");
}
4 changes: 4 additions & 0 deletions lib/std/compress/tar.zig
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
test {
_ = @import("tar/reader_test.zig");
_ = @import("tar/test_decompress.zig");
}
Comment on lines +1 to +4
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't like this file, this looks like a big kludge

763 changes: 763 additions & 0 deletions lib/std/compress/tar/reader_test.zig

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions lib/std/compress/tar/test_common.zig
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
const std = @import("std");

/// testing helper for decompressing a .gz file. returns an io.fixedBufferStream
/// with the decompressed data. caller owns the returned FixedBufferStream.buffer
pub fn decompressGz(
comptime file_name: []const u8,
alloc: std.mem.Allocator,
) !std.io.FixedBufferStream([]u8) {
var fbs = std.io.fixedBufferStream(@embedFile(file_name));
var decompressor = try std.compress.gzip.decompress(alloc, fbs.reader());
defer decompressor.deinit();
const decompressed = try decompressor.reader().readAllAlloc(alloc, 1024 * 32);
return std.io.fixedBufferStream(decompressed);
}
50 changes: 50 additions & 0 deletions lib/std/compress/tar/test_decompress.zig
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
const std = @import("std");
const mem = std.mem;
const tar = std.tar;
const testing = std.testing;
const talloc = testing.allocator;
const builtin = @import("builtin");
const test_common = @import("test_common.zig");

test "std.tar decompress testdata" {
// skip due to 'incorrect alignment', maybe the same as
// https://github.com/ziglang/zig/issues/14036
if (builtin.os.tag == .windows and builtin.mode == .Debug)
return error.SkipZigTest;

const test_files = [_][]const u8{
"xattrs.tar",
"gnu-long-nul.tar",
"v7.tar",
"pax-bad-hdr-file.tar",
"pax-global-records.tar",
"star.tar",
"pax-multi-hdrs.tar",
"gnu.tar",
"gnu-utf8.tar",
"trailing-slash.tar",
"pax.tar",
"nil-uid.tar",
"ustar-file-devs.tar",
"pax-pos-size-file.tar",
"hardlink.tar",
"pax-records.tar",
"gnu-multi-hdrs.tar",
"hardlink.tar",
"dir-symlink.tar",
};

inline for (test_files) |test_file| {
var fbs = try test_common.decompressGz("testdata/" ++ test_file ++ ".gz", talloc);
defer talloc.free(fbs.buffer);
try testDecompressTarToTmp(&fbs, .{ .mode_mode = .ignore });
fbs.reset();
try testDecompressTarToTmp(&fbs, .{ .mode_mode = .executable_bit_only });
}
}

fn testDecompressTarToTmp(fbs: *std.io.FixedBufferStream([]u8), options: tar.Options) !void {
var tmpdir = testing.tmpDir(.{});
defer tmpdir.cleanup();
try tar.pipeToFileSystem(talloc, tmpdir.dir, fbs.reader(), options);
}
Binary file added lib/std/compress/tar/testdata/dir-symlink.tar.gz
Binary file not shown.
Binary file added lib/std/compress/tar/testdata/gnu-long-nul.tar.gz
Binary file not shown.
Binary file added lib/std/compress/tar/testdata/gnu-multi-hdrs.tar.gz
Binary file not shown.
Binary file not shown.
Binary file added lib/std/compress/tar/testdata/gnu-not-utf8.tar.gz
Binary file not shown.
Binary file added lib/std/compress/tar/testdata/gnu-utf8.tar.gz
Binary file not shown.
Binary file added lib/std/compress/tar/testdata/gnu.tar.gz
Binary file not shown.
Binary file added lib/std/compress/tar/testdata/hardlink.tar.gz
Binary file not shown.
Binary file added lib/std/compress/tar/testdata/issue10968.tar.gz
Binary file not shown.
Binary file added lib/std/compress/tar/testdata/issue11169.tar.gz
Binary file not shown.
Binary file added lib/std/compress/tar/testdata/issue12435.tar.gz
Binary file not shown.
Binary file added lib/std/compress/tar/testdata/neg-size.tar.gz
Binary file not shown.
Binary file added lib/std/compress/tar/testdata/nil-uid.tar.gz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added lib/std/compress/tar/testdata/pax-multi-hdrs.tar.gz
Binary file not shown.
Binary file added lib/std/compress/tar/testdata/pax-nul-path.tar.gz
Binary file not shown.
Binary file added lib/std/compress/tar/testdata/pax-nul-xattrs.tar.gz
Binary file not shown.
Binary file not shown.
Binary file added lib/std/compress/tar/testdata/pax-records.tar.gz
Binary file not shown.
Binary file added lib/std/compress/tar/testdata/pax.tar.gz
Binary file not shown.
Binary file added lib/std/compress/tar/testdata/star.tar.gz
Binary file not shown.
Binary file added lib/std/compress/tar/testdata/trailing-slash.tar.gz
Binary file not shown.
Binary file not shown.
Binary file added lib/std/compress/tar/testdata/v7.tar.gz
Binary file not shown.
Binary file added lib/std/compress/tar/testdata/xattrs.tar.gz
Binary file not shown.
Loading