Skip to content

Fix Dir.statFile for WASI when linking libc #17029

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kubkon merged 2 commits into from
Sep 1, 2023
Merged

Fix Dir.statFile for WASI when linking libc #17029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f46008c
Fix `Dir.statFile` for WASI when linking libc
squeek502 Aug 31, 2023
01f9cdd
Temporarily disable Dir.statFile test when linking glibc
squeek502 Sep 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 10 additions & 14 deletions lib/std/fs.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2653,21 +2653,17 @@ pub const Dir = struct {
///
/// `sub_path` may be absolute, in which case `self` is ignored.
pub fn statFile(self: Dir, sub_path: []const u8) StatFileError!Stat {
switch (builtin.os.tag) {
.windows => {
var file = try self.openFile(sub_path, .{});
defer file.close();
return file.stat();
},
.wasi => {
const st = try os.fstatatWasi(self.fd, sub_path, os.wasi.LOOKUP_SYMLINK_FOLLOW);
return Stat.fromSystem(st);
},
else => {
const st = try os.fstatat(self.fd, sub_path, 0);
return Stat.fromSystem(st);
},
if (builtin.os.tag == .windows) {
var file = try self.openFile(sub_path, .{});
defer file.close();
return file.stat();
}
if (builtin.os.tag == .wasi and !builtin.link_libc) {
const st = try os.fstatatWasi(self.fd, sub_path, os.wasi.LOOKUP_SYMLINK_FOLLOW);
return Stat.fromSystem(st);
}
const st = try os.fstatat(self.fd, sub_path, 0);
return Stat.fromSystem(st);
}

const Permissions = File.Permissions;
Expand Down
18 changes: 18 additions & 0 deletions lib/std/fs/test.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,6 +569,24 @@ test "readAllAlloc" {
try testing.expectError(error.FileTooBig, file.readToEndAlloc(testing.allocator, write_buf.len - 1));
}

test "Dir.statFile" {
// TODO: Re-enable once https://github.com/ziglang/zig/issues/17034 is solved
if (builtin.os.tag == .linux and builtin.link_libc and builtin.abi == .gnu) return error.SkipZigTest;

try testWithAllSupportedPathTypes(struct {
fn impl(ctx: *TestContext) !void {
const test_file_name = try ctx.transformPath("test_file");

try testing.expectError(error.FileNotFound, ctx.dir.statFile(test_file_name));

try ctx.dir.writeFile(test_file_name, "");

const stat = try ctx.dir.statFile(test_file_name);
try testing.expectEqual(File.Kind.file, stat.kind);
}
}.impl);
}

test "directory operations on files" {
try testWithAllSupportedPathTypes(struct {
fn impl(ctx: *TestContext) !void {
Expand Down