mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-31 02:23:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

std.tar.Writer: fix 32-bit

Browse Source
This commit is contained in:
Andrew Kelley 2025-07-20 20:54:15 -07:00
parent 1dcea220a4
commit cc334b4ee2
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/std/tar/Writer.zig
View File

@ -55,7 +55,7 @@ pub fn writeFile(
try w.underlying_writer.writeAll(@ptrCast((&header)[0..1]));
_ = try w.underlying_writer.sendFileAll(file_reader, .unlimited);
try w.writePadding(size);
try w.writePadding64(size);
}
pub const WriteFileStreamError = Error || std.Io.Reader.StreamError;
@ -71,7 +71,7 @@ pub fn writeFileStream(
) WriteFileStreamError!void {
try w.writeHeader(.regular, sub_path, "", size, options);
try reader.streamExact64(w.underlying_writer, size);
try w.writePadding(size);
try w.writePadding64(size);
}
/// Writes file using bytes buffer `content` for size and file content.
@ -172,7 +172,14 @@ fn writeExtendedHeader(w: *Writer, typeflag: Header.FileType, buffers: []const [
}
fn writePadding(w: *Writer, bytes: usize) std.Io.Writer.Error!void {
const pos = bytes % block_size;
return writePaddingPos(w, bytes % block_size);
}
fn writePadding64(w: *Writer, bytes: u64) std.Io.Writer.Error!void {
return writePaddingPos(w, @intCast(bytes % block_size));
}
fn writePaddingPos(w: *Writer, pos: usize) std.Io.Writer.Error!void {
if (pos == 0) return;
try w.underlying_writer.splatByteAll(0, block_size - pos);
}