motiejus/zig
1
Fork 0
Code Releases Activity

Package.Fetch: normalize path separators in symlinks

Browse Source 
closes #17549
This commit is contained in:
Andrew Kelley
2023-10-16 16:47:47 -07:00
parent 1456f95b3c
commit b171a6f25d
2 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/std/mem.zig
View File

@@ -3810,12 +3810,11 @@ test "replace" {
try testing.expectEqualStrings(expected, output[0..expected.len]);
}
/// Replace all occurrences of `needle` with `replacement`.
pub fn replaceScalar(comptime T: type, slice: []T, needle: T, replacement: T) void {
for (slice, 0..) |e, i| {
if (e == needle) {
slice[i] = replacement;
}
/// Replace all occurrences of `match` with `replacement`.
pub fn replaceScalar(comptime T: type, slice: []T, match: T, replacement: T) void {
for (slice) |*e| {
if (e.* == match)
e.* = replacement;
}
}

30
src/Package/Fetch.zig
View File

@@ -1329,7 +1329,7 @@ fn computeHash(
const hashed_file = try arena.create(HashedFile);
hashed_file.* = .{
.fs_path = fs_path,
.normalized_path = try normalizePath(arena, fs_path),
.normalized_path = try normalizePathAlloc(arena, fs_path),
.kind = kind,
.hash = undefined, // to be populated by the worker
.failure = undefined, // to be populated by the worker
@@ -1429,6 +1429,12 @@ fn hashFileFallible(dir: fs.Dir, hashed_file: *HashedFile) HashedFile.Error!void
},
.sym_link => {
const link_name = try dir.readLink(hashed_file.fs_path, &buf);
if (fs.path.sep != canonical_sep) {
// Package hashes are intended to be consistent across
// platforms which means we must normalize path separators
// inside symlinks.
normalizePath(link_name);
}
hasher.update(link_name);
},
}
@@ -1484,22 +1490,20 @@ const HashedFile = struct {
/// Make a file system path identical independently of operating system path inconsistencies.
/// This converts backslashes into forward slashes.
fn normalizePath(arena: Allocator, fs_path: []const u8) ![]const u8 {
const canonical_sep = '/';
if (fs.path.sep == canonical_sep)
return fs_path;
fn normalizePathAlloc(arena: Allocator, fs_path: []const u8) ![]const u8 {
if (fs.path.sep == canonical_sep) return fs_path;
const normalized = try arena.dupe(u8, fs_path);
for (normalized) |*byte| {
switch (byte.*) {
fs.path.sep => byte.* = canonical_sep,
else => continue,
}
}
normalizePath(normalized);
return normalized;
}
const canonical_sep = fs.path.sep_posix;
fn normalizePath(bytes: []u8) void {
assert(fs.path.sep != canonical_sep);
std.mem.replaceScalar(u8, bytes, fs.path.sep, canonical_sep);
}
const Filter = struct {
include_paths: std.StringArrayHashMapUnmanaged(void) = .{},