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

std.fs.File.Writer: fix splat alias bug

Browse Source 
same deal as previous commit
This commit is contained in:
Andrew Kelley 2025-07-09 18:38:46 -07:00
parent 9e52febeeb
commit 55bced9563
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/std/fs/File.zig
View File

@ -1728,25 +1728,22 @@ pub const Writer = struct {
iovecs[len] = .{ .base = buffered.ptr, .len = buffered.len }; iovecs[len] = .{ .base = buffered.ptr, .len = buffered.len };
len += 1; len += 1;
} }
for (data) |d| { for (data[0 .. data.len - 1]) |d| {
if (d.len == 0) continue; if (d.len == 0) continue;
iovecs[len] = .{ .base = d.ptr, .len = d.len }; iovecs[len] = .{ .base = d.ptr, .len = d.len };
len += 1; len += 1;
if (iovecs.len - len == 0) break; if (iovecs.len - len == 0) break;
} }
if (len == 0) return 0;
const pattern = data[data.len - 1]; const pattern = data[data.len - 1];
switch (splat) { if (iovecs.len - len != 0) switch (splat) {
0 => if (iovecs[len - 1].base == pattern.ptr) { 0 => {},
len -= 1; 1 => if (pattern.len != 0) {
iovecs[len] = .{ .base = pattern.ptr, .len = pattern.len };
len += 1;
}, },
1 => {},
else => switch (pattern.len) { else => switch (pattern.len) {
0 => {}, 0 => {},
1 => memset: { 1 => {
// Replace the 1-byte buffer with a bigger one.
if (iovecs[len - 1].base == pattern.ptr) len -= 1;
if (iovecs.len - len == 0) break :memset;
const splat_buffer_candidate = io_w.buffer[io_w.end..]; const splat_buffer_candidate = io_w.buffer[io_w.end..];
var backup_buffer: [64]u8 = undefined; var backup_buffer: [64]u8 = undefined;
const splat_buffer = if (splat_buffer_candidate.len >= backup_buffer.len) const splat_buffer = if (splat_buffer_candidate.len >= backup_buffer.len)
@ -1770,13 +1767,14 @@ pub const Writer = struct {
len += 1; len += 1;
} }
}, },
else => for (0..splat - 1) |_| { else => for (0..splat) |_| {
if (iovecs.len - len == 0) break;
iovecs[len] = .{ .base = pattern.ptr, .len = pattern.len }; iovecs[len] = .{ .base = pattern.ptr, .len = pattern.len };
len += 1; len += 1;
if (iovecs.len - len == 0) break;
}, },
}, },
} };
if (len == 0) return 0;
switch (w.mode) { switch (w.mode) {
.positional, .positional_reading => { .positional, .positional_reading => {
const n = std.posix.pwritev(handle, iovecs[0..len], w.pos) catch |err| switch (err) { const n = std.posix.pwritev(handle, iovecs[0..len], w.pos) catch |err| switch (err) {