authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-10-27 17:49:21-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-10-29 06:20:51-07:00
log135ec79f50ff36d48563be126c3e49793b04f302
tree9998a41a43ac5be0b14bfb9961463dff79739d59
parent6b8972dd22d13957fd0c844a8359c82cedcfe939

std.Io.File: fix stat for Windows

2 files changed, 17 insertions(+), 21 deletions(-)

lib/std/Io/File.zig-4
......@@ -395,10 +395,6 @@ pub const Reader = struct {
395395 pub fn getSize(r: *Reader) SizeError!u64 {
396396 return r.size orelse {
397397 if (r.size_err) |err| return err;
398 if (std.posix.Stat == void) {
399 r.size_err = error.Streaming;
400 return error.Streaming;
401 }
402398 if (stat(r.file, r.io)) |st| {
403399 if (st.kind == .file) {
404400 r.size = st.size;
lib/std/Io/Threaded.zig+17-17
......@@ -2557,19 +2557,21 @@ fn fileReadStreamingPosix(userdata: ?*anyopaque, file: Io.File, data: [][]u8) Io
25572557
25582558fn fileReadStreamingWindows(userdata: ?*anyopaque, file: Io.File, data: [][]u8) Io.File.ReadStreamingError!usize {
25592559 const t: *Threaded = @ptrCast(@alignCast(userdata));
2560 try t.checkCancel();
25612560
25622561 const DWORD = windows.DWORD;
25632562 var index: usize = 0;
25642563 while (data[index].len == 0) index += 1;
2565
25662564 const buffer = data[index];
25672565 const want_read_count: DWORD = @min(std.math.maxInt(DWORD), buffer.len);
2568 var n: DWORD = undefined;
2569 if (windows.kernel32.ReadFile(file.handle, buffer.ptr, want_read_count, &n, null) == 0) {
2566
2567 while (true) {
2568 try t.checkCancel();
2569 var n: DWORD = undefined;
2570 if (windows.kernel32.ReadFile(file.handle, buffer.ptr, want_read_count, &n, null) != 0)
2571 return n;
25702572 switch (windows.GetLastError()) {
25712573 .IO_PENDING => |err| return windows.errorBug(err),
2572 .OPERATION_ABORTED => return error.Canceled,
2574 .OPERATION_ABORTED => continue,
25732575 .BROKEN_PIPE => return 0,
25742576 .HANDLE_EOF => return 0,
25752577 .NETNAME_DELETED => return error.ConnectionResetByPeer,
......@@ -2579,7 +2581,6 @@ fn fileReadStreamingWindows(userdata: ?*anyopaque, file: Io.File, data: [][]u8)
25792581 else => |err| return windows.unexpectedError(err),
25802582 }
25812583 }
2582 return n;
25832584}
25842585
25852586fn fileReadPositionalPosix(userdata: ?*anyopaque, file: Io.File, data: [][]u8, offset: u64) Io.File.ReadPositionalError!usize {
......@@ -2661,33 +2662,34 @@ const fileReadPositional = switch (native_os) {
26612662
26622663fn fileReadPositionalWindows(userdata: ?*anyopaque, file: Io.File, data: [][]u8, offset: u64) Io.File.ReadPositionalError!usize {
26632664 const t: *Threaded = @ptrCast(@alignCast(userdata));
2664 try t.checkCancel();
26652665
26662666 const DWORD = windows.DWORD;
2667 const OVERLAPPED = windows.OVERLAPPED;
26682667
26692668 var index: usize = 0;
26702669 while (data[index].len == 0) index += 1;
2671
26722670 const buffer = data[index];
26732671 const want_read_count: DWORD = @min(std.math.maxInt(DWORD), buffer.len);
2674 var n: DWORD = undefined;
2675 var overlapped: OVERLAPPED = .{
2672
2673 var overlapped: windows.OVERLAPPED = .{
26762674 .Internal = 0,
26772675 .InternalHigh = 0,
26782676 .DUMMYUNIONNAME = .{
26792677 .DUMMYSTRUCTNAME = .{
2680 .Offset = @as(u32, @truncate(offset)),
2681 .OffsetHigh = @as(u32, @truncate(offset >> 32)),
2678 .Offset = @truncate(offset),
2679 .OffsetHigh = @truncate(offset >> 32),
26822680 },
26832681 },
26842682 .hEvent = null,
26852683 };
26862684
2687 if (windows.kernel32.ReadFile(file.handle, buffer.ptr, want_read_count, &n, &overlapped) == 0) {
2685 while (true) {
2686 try t.checkCancel();
2687 var n: DWORD = undefined;
2688 if (windows.kernel32.ReadFile(file.handle, buffer.ptr, want_read_count, &n, &overlapped) != 0)
2689 return n;
26882690 switch (windows.GetLastError()) {
26892691 .IO_PENDING => |err| return windows.errorBug(err),
2690 .OPERATION_ABORTED => return error.Canceled,
2692 .OPERATION_ABORTED => continue,
26912693 .BROKEN_PIPE => return 0,
26922694 .HANDLE_EOF => return 0,
26932695 .NETNAME_DELETED => return error.ConnectionResetByPeer,
......@@ -2697,8 +2699,6 @@ fn fileReadPositionalWindows(userdata: ?*anyopaque, file: Io.File, data: [][]u8,
26972699 else => |err| return windows.unexpectedError(err),
26982700 }
26992701 }
2700
2701 return n;
27022702}
27032703
27042704fn fileSeekBy(userdata: ?*anyopaque, file: Io.File, offset: i64) Io.File.SeekError!void {