motiejus/zig

commit 64ddba955a1f98ab77cfb39844a09f472ebc4609 (tree)
parent 1253d591be2aeea49c0b67ce0416237060e78a57
Author: Michael Dusan <michael.dusan@gmail.com>
Date:   Thu, 15 Jun 2023 14:48:19 -0400

freebsd: fix std.c.getdents

- fix getdents return type usize → isize
- usize ultimately forced errors to .SUCCESS in std.c.getError

New behavior in freebsd 13.2 is to return ENOENT if the directory being
iterated is deleted during iteration. We now detect this and treat it
consistent with iteration ending.

Diffstat:
M
lib/std/c/freebsd.zig
 | 
2
+-
M
lib/std/fs.zig
 | 
3
+++

2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/std/c/freebsd.zig b/lib/std/c/freebsd.zig
@@ -75,7 +75,7 @@ pub const _errno = __error;
 
 pub extern "c" var malloc_options: [*:0]const u8;
 
-pub extern "c" fn getdents(fd: c_int, buf_ptr: [*]u8, nbytes: usize) usize;
+pub extern "c" fn getdents(fd: c_int, buf_ptr: [*]u8, nbytes: usize) isize;
 pub extern "c" fn sigaltstack(ss: ?*stack_t, old_ss: ?*stack_t) c_int;
 pub extern "c" fn getrandom(buf_ptr: [*]u8, buf_len: usize, flags: c_uint) isize;
 pub extern "c" fn getentropy(buf_ptr: [*]u8, buf_len: usize) c_int;
diff --git a/lib/std/fs.zig b/lib/std/fs.zig
@@ -478,6 +478,9 @@ pub const IterableDir = struct {
                             .FAULT => unreachable,
                             .NOTDIR => unreachable,
                             .INVAL => unreachable,
+                            // Introduced in freebsd 13.2: directory unlinked but still open.
+                            // To be consistent, iteration ends if the directory being iterated is deleted during iteration.
+                            .NOENT => return null,
                             else => |err| return os.unexpectedErrno(err),
                         }
                         if (rc == 0) return null;