Commit e5a55f61441944042a9e47de51ea8f2523edb03e | zig

author	Maciej 'vesim' Kuliński <vesim809@pm.me> 2025-09-14 17:26:55+02:00
committer	Andrew Kelley <andrew@ziglang.org> 2025-10-08 17:14:03-07:00
log	e5a55f61441944042a9e47de51ea8f2523edb03e
tree	b0ec5b386446601b89403bf3dfccd134dbae7348
parent	bf58b4e41990973a72ef49163abe63d41c966e23

std: std.fs.File fix sendFile with buffered data

fixes #25196

Co-authored-by: Andrew Kelley <andrew@ziglang.org>

2 files changed, 36 insertions(+), 1 deletions(-)

lib
- std
  - fs
    File.zig
    test.zig

lib/std/fs/File.zig+1-1

...	@@ -1732,7 +1732,7 @@ pub const Writer = struct {	...	@@ -1732,7 +1732,7 @@ pub const Writer = struct {
1732	) std.Io.Writer.FileError!usize {	1732	) std.Io.Writer.FileError!usize {
1733	const reader_buffered = file_reader.interface.buffered();	1733	const reader_buffered = file_reader.interface.buffered();
1734	if (reader_buffered.len >= @intFromEnum(limit))	1734	if (reader_buffered.len >= @intFromEnum(limit))
1735	return sendFileBuffered(io_w, file_reader, reader_buffered);	1735	return sendFileBuffered(io_w, file_reader, limit.slice(reader_buffered));
1736	const writer_buffered = io_w.buffered();	1736	const writer_buffered = io_w.buffered();
1737	const file_limit = @intFromEnum(limit) - reader_buffered.len;	1737	const file_limit = @intFromEnum(limit) - reader_buffered.len;
1738	const w: *Writer = @alignCast(@fieldParentPtr("interface", io_w));	1738	const w: *Writer = @alignCast(@fieldParentPtr("interface", io_w));

lib/std/fs/test.zig+35

...	@@ -1525,6 +1525,41 @@ test "sendfile" {	...	@@ -1525,6 +1525,41 @@ test "sendfile" {
1525	try testing.expectEqualStrings("header1\nsecond header\nine1\nsecontrailer1\nsecond trailer\n", written_buf[0..amt]);	1525	try testing.expectEqualStrings("header1\nsecond header\nine1\nsecontrailer1\nsecond trailer\n", written_buf[0..amt]);
1526	}	1526	}
1527		1527
		1528	test "sendfile with buffered data" {
		1529	var tmp = tmpDir(.{});
		1530	defer tmp.cleanup();
		1531
		1532	try tmp.dir.makePath("os_test_tmp");
		1533
		1534	var dir = try tmp.dir.openDir("os_test_tmp", .{});
		1535	defer dir.close();
		1536
		1537	var src_file = try dir.createFile("sendfile1.txt", .{ .read = true });
		1538	defer src_file.close();
		1539
		1540	try src_file.writeAll("AAAABBBB");
		1541
		1542	var dest_file = try dir.createFile("sendfile2.txt", .{ .read = true });
		1543	defer dest_file.close();
		1544
		1545	var src_buffer: [32]u8 = undefined;
		1546	var file_reader = src_file.reader(&src_buffer);
		1547
		1548	try file_reader.seekTo(0);
		1549	try file_reader.interface.fill(8);
		1550
		1551	var fallback_buffer: [32]u8 = undefined;
		1552	var file_writer = dest_file.writer(&fallback_buffer);
		1553
		1554	try std.testing.expectEqual(4, try file_writer.interface.sendFileAll(&file_reader, .limited(4)));
		1555
		1556	var written_buf: [8]u8 = undefined;
		1557	const amt = try dest_file.preadAll(&written_buf, 0);
		1558
		1559	try std.testing.expectEqual(4, amt);
		1560	try std.testing.expectEqualSlices(u8, "AAAA", written_buf[0..amt]);
		1561	}
		1562
1528	test "copyRangeAll" {	1563	test "copyRangeAll" {
1529	var tmp = tmpDir(.{});	1564	var tmp = tmpDir(.{});
1530	defer tmp.cleanup();	1565	defer tmp.cleanup();