Skip to content

std.fs: Improve tests and fix some bugs that were uncovered #16847

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
andrewrk merged 6 commits into from
Aug 17, 2023
Merged

std.fs: Improve tests and fix some bugs that were uncovered #16847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3e69115
Do not skip fs.Dir.access test on WASI
squeek502 Aug 10, 2023
19b219b
Fix windows.CreateSymbolicLink/ReadLink for non-relative paths
squeek502 Aug 10, 2023
3819e69
windows.GetFinalPathNameByHandle: Support UNC paths
squeek502 Aug 11, 2023
8f5f1ff
fs tests: Test multiple different path types in most tests
squeek502 Aug 17, 2023
8c8f3cb
fs tests: Update some testing.expect calls to use the more specific e…
squeek502 Aug 15, 2023
2b44961
Fix ntToWin32Namespace and friends on big endian architectures
squeek502 Aug 17, 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
13 changes: 11 additions & 2 deletions lib/std/fs.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1949,7 +1949,13 @@ pub const Dir = struct {
return self.symLinkWasi(target_path, sym_link_path, flags);
}
if (builtin.os.tag == .windows) {
const target_path_w = try os.windows.sliceToPrefixedFileW(self.fd, target_path);
// Target path does not use sliceToPrefixedFileW because certain paths
// are handled differently when creating a symlink than they would be
// when converting to an NT namespaced path. CreateSymbolicLink in
// symLinkW will handle the necessary conversion.
var target_path_w: os.windows.PathSpace = undefined;
target_path_w.len = try std.unicode.utf8ToUtf16Le(&target_path_w.data, target_path);
target_path_w.data[target_path_w.len] = 0;
const sym_link_path_w = try os.windows.sliceToPrefixedFileW(self.fd, sym_link_path);
return self.symLinkW(target_path_w.span(), sym_link_path_w.span(), flags);
}
Expand Down Expand Up @@ -1987,7 +1993,10 @@ pub const Dir = struct {
/// are null-terminated, WTF16 encoded.
pub fn symLinkW(
self: Dir,
target_path_w: []const u16,
/// WTF-16, does not need to be NT-prefixed. The NT-prefixing
/// of this path is handled by CreateSymbolicLink.
target_path_w: [:0]const u16,
/// WTF-16, must be NT-prefixed or relative
sym_link_path_w: []const u16,
flags: SymLinkFlags,
) !void {
Expand Down
Loading