From dae3887bedda30e08d5fc0589fbe6a70f4d33d61 Mon Sep 17 00:00:00 2001 From: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com> Date: Wed, 6 Sep 2023 09:20:30 -0700 Subject: [PATCH] Undo that change --- src/resolver/resolve_path.zig | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/resolver/resolve_path.zig b/src/resolver/resolve_path.zig index deb84602c2..b7ca927446 100644 --- a/src/resolver/resolve_path.zig +++ b/src/resolver/resolve_path.zig @@ -463,11 +463,10 @@ pub fn relative(from: []const u8, to: []const u8) []const u8 { } pub fn relativePlatform(from: []const u8, to: []const u8, comptime platform: Platform, comptime always_copy: bool) []const u8 { - const normalized_from = if (platform.isAbsolute(from)) brk: { - const leading_separator = platform.leadingSeparatorIndex(from) orelse break :brk from; - var path = normalizeStringBuf(from, relative_from_buf[leading_separator..], true, platform, true); - @memcpy(relative_from_buf[0..leading_separator], from[0..leading_separator]); - break :brk relative_from_buf[0 .. path.len + leading_separator]; + const normalized_from = if (from.len > 0 and from[0] == platform.separator()) brk: { + var path = normalizeStringBuf(from, relative_from_buf[1..], true, platform, true); + relative_from_buf[0] = platform.separator(); + break :brk relative_from_buf[0 .. path.len + 1]; } else joinAbsStringBuf( Fs.FileSystem.instance.top_level_dir, &relative_from_buf,