mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-08 06:44:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix symLink's handling of / path separators on Windows

Browse source 
Symlink targets require canonicalized path separators on Windows
This commit is contained in:
Ryan Liptak 2024-02-29 15:54:46 -08:00
parent 147beec7da
commit e233971e4f
2 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/std/fs/Dir.zig
View file

@ -1705,6 +1705,15 @@ pub fn symLink(
var target_path_w: std.os.windows.PathSpace = undefined; var target_path_w: std.os.windows.PathSpace = undefined;
target_path_w.len = try std.unicode.wtf8ToWtf16Le(&target_path_w.data, target_path); target_path_w.len = try std.unicode.wtf8ToWtf16Le(&target_path_w.data, target_path);
target_path_w.data[target_path_w.len] = 0; target_path_w.data[target_path_w.len] = 0;
// However, we need to canonicalize any path separators to `\`, since if
// the target path is relative, then it must use `\` as the path separator.
mem.replaceScalar(
u16,
target_path_w.data[0..target_path_w.len],
mem.nativeToLittle(u16, '/'),
mem.nativeToLittle(u16, '\\'),
);
const sym_link_path_w = try std.os.windows.sliceToPrefixedFileW(self.fd, sym_link_path); const sym_link_path_w = try std.os.windows.sliceToPrefixedFileW(self.fd, sym_link_path);
return self.symLinkW(target_path_w.span(), sym_link_path_w.span(), flags); return self.symLinkW(target_path_w.span(), sym_link_path_w.span(), flags);
} }
@ -1744,6 +1753,7 @@ pub fn symLinkW(
self: Dir, self: Dir,
/// WTF-16, does not need to be NT-prefixed. The NT-prefixing /// WTF-16, does not need to be NT-prefixed. The NT-prefixing
/// of this path is handled by CreateSymbolicLink. /// of this path is handled by CreateSymbolicLink.
/// Any path separators must be `\`, not `/`.
target_path_w: [:0]const u16, target_path_w: [:0]const u16,
/// WTF-16, must be NT-prefixed or relative /// WTF-16, must be NT-prefixed or relative
sym_link_path_w: []const u16, sym_link_path_w: []const u16,

13
lib/std/fs/test.zig
View file

@ -178,6 +178,19 @@ fn testReadLinkAbsolute(target_path: []const u8, symlink_path: []const u8) !void
try testing.expectEqualStrings(target_path, given); try testing.expectEqualStrings(target_path, given);
} }
test "Dir.symLink with relative target that has a / path separator" {
var tmp = testing.tmpDir(.{});
defer tmp.cleanup();
try tmp.dir.makePath("a");
try tmp.dir.writeFile("a/file", "");
try tmp.dir.symLink("a/file", "symlink", .{});
const stat = try tmp.dir.statFile("symlink");
// statFile follows symlinks
try testing.expectEqual(File.Kind.file, stat.kind);
}
test "File.stat on a File that is a symlink returns Kind.sym_link" { test "File.stat on a File that is a symlink returns Kind.sym_link" {
// This test requires getting a file descriptor of a symlink which // This test requires getting a file descriptor of a symlink which
// is not possible on all targets // is not possible on all targets