authorgravatar for igor.anic@gmail.comIgor Anić <igor.anic@gmail.com> 2023-12-12 14:18:20+01:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-01-13 19:37:33-07:00
log76fe1f53d5b9cfae100854afe495e8b378d2dc9e
treeba636c65aa00fee1390742052b5c121968c6bef8
parenta75fd4ff156abdd131c2b609b9b19573813838a0

tar: fix tests on 32-bit platforms

2 files changed, 14 insertions(+), 11 deletions(-)

lib/std/tar.zig+10-10
......@@ -250,7 +250,7 @@ fn TarReader(comptime ReaderType: type) type {
250250 pub const File = struct {
251251 name: []const u8, // name of file, symlink or directory
252252 link_name: []const u8, // target name of symlink
253 size: usize, // size of the file in bytes
253 size: u64, // size of the file in bytes
254254 mode: u32,
255255 kind: Header.Kind,
256256
......@@ -260,7 +260,7 @@ fn TarReader(comptime ReaderType: type) type {
260260 pub fn write(self: File, writer: anytype) !void {
261261 var buffer: [4096]u8 = undefined;
262262
263 var n: usize = 0;
263 var n: u64 = 0;
264264 while (n < self.size) {
265265 const buf = buffer[0..@min(buffer.len, self.size - n)];
266266 try self.reader.readNoEof(buf);
......@@ -308,9 +308,9 @@ fn TarReader(comptime ReaderType: type) type {
308308 }
309309
310310 // Number of padding bytes in the last file block.
311 inline fn blockPadding(size: usize) usize {
312 const block_rounded = std.mem.alignForward(usize, size, Header.SIZE); // size rounded to te block boundary
313 return block_rounded - size;
311 inline fn blockPadding(size: u64) usize {
312 const block_rounded = std.mem.alignForward(u64, size, Header.SIZE); // size rounded to te block boundary
313 return @intCast(block_rounded - size);
314314 }
315315
316316 /// Iterates through the tar archive as if it is a series of files.
......@@ -324,7 +324,7 @@ fn TarReader(comptime ReaderType: type) type {
324324
325325 while (try self.readHeader()) |header| {
326326 const kind = header.kind();
327 const size: usize = @intCast(try header.size());
327 const size: u64 = try header.size();
328328 self.padding = blockPadding(size);
329329
330330 switch (kind) {
......@@ -349,16 +349,16 @@ fn TarReader(comptime ReaderType: type) type {
349349 },
350350 // Prefix header types
351351 .gnu_long_name => {
352 self.file.name = try self.readString(size, &self.file_name_buffer);
352 self.file.name = try self.readString(@intCast(size), &self.file_name_buffer);
353353 },
354354 .gnu_long_link => {
355 self.file.link_name = try self.readString(size, &self.link_name_buffer);
355 self.file.link_name = try self.readString(@intCast(size), &self.link_name_buffer);
356356 },
357357 .extended_header => {
358358 // Use just attributes from last extended header.
359359 self.initFile();
360360
361 var rdr = paxReader(self.reader, size);
361 var rdr = paxReader(self.reader, @intCast(size));
362362 while (try rdr.next()) |attr| {
363363 switch (attr.kind) {
364364 .path => {
......@@ -369,7 +369,7 @@ fn TarReader(comptime ReaderType: type) type {
369369 },
370370 .size => {
371371 var buf: [64]u8 = undefined;
372 self.file.size = try std.fmt.parseInt(usize, try attr.value(&buf), 10);
372 self.file.size = try std.fmt.parseInt(u64, try attr.value(&buf), 10);
373373 },
374374 }
375375 }
lib/std/tar/test.zig+4-1
......@@ -1,12 +1,15 @@
11const std = @import("../std.zig");
2const builtin = @import("builtin");
23const tar = std.tar;
34const assert = std.debug.assert;
45
56test "tar run Go test cases" {
7 if (builtin.os.tag == .wasi) return error.SkipZigTest;
8
69 const Case = struct {
710 const File = struct {
811 name: []const u8,
9 size: usize = 0,
12 size: u64 = 0,
1013 mode: u32 = 0,
1114 link_name: []const u8 = &[0]u8{},
1215 kind: tar.Header.Kind = .normal,