Commit b171a6f25d5257f615b6369c11f8307dcf076c0d | zig

author	Andrew Kelley <andrew@ziglang.org> 2023-10-16 16:47:47-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2023-10-16 16:47:47-07:00
log	b171a6f25d5257f615b6369c11f8307dcf076c0d
tree	aacbc8f10addf524d4a3ff9a483ba1991e27eb85
parent	1456f95b3c043aa7e5b655c362cc3bd05aa3c795

Package.Fetch: normalize path separators in symlinks

closes #17549

2 files changed, 22 insertions(+), 19 deletions(-)

lib
- std
  - mem.zig
src
- Package
  - Fetch.zig

lib/std/mem.zig+5-6

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

src/Package/Fetch.zig+17-13

 @@ -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 {
+fn normalizePathAlloc(arena: Allocator, fs_path: []const u8) ![]const u8 {
-    const canonical_sep = '/';
+    if (fs.path.sep == canonical_sep) return fs_path;
-    if (fs.path.sep == canonical_sep)
-        return fs_path;
     const normalized = try arena.dupe(u8, fs_path);
-    for (normalized) |*byte| {
+    normalizePath(normalized);
-        switch (byte.*) {
-            fs.path.sep => byte.* = canonical_sep,
-            else => continue,
-        }
-    }
     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) = .{},