From 938af75efb263d1235b626972dfd4ac928eb803f Mon Sep 17 00:00:00 2001
From: Ryan Fleury <ryan.j.fleury@gmail.com>
Date: Wed, 16 Oct 2024 13:33:47 -0700
Subject: [PATCH] normalize paths when doing file-path <-> eval string

---
 src/raddbg/raddbg_core.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/raddbg/raddbg_core.c b/src/raddbg/raddbg_core.c
index ca50a10d..b4fb08b3 100644
--- a/src/raddbg/raddbg_core.c
+++ b/src/raddbg/raddbg_core.c
@@ -2846,7 +2846,8 @@ rd_file_path_from_eval_string(Arena *arena, String8 string)
     E_Eval eval = e_eval_from_string(scratch.arena, string);
     if(eval.expr->kind == E_ExprKind_LeafFilePath)
     {
-      result = raw_from_escaped_str8(arena, eval.expr->string);
+      result = raw_from_escaped_str8(scratch.arena, eval.expr->string);
+      result = path_normalized_from_string(arena, result);
     }
     scratch_end(scratch);
   }
@@ -2857,7 +2858,8 @@ internal String8
 rd_eval_string_from_file_path(Arena *arena, String8 string)
 {
   Temp scratch = scratch_begin(&arena, 1);
-  String8 string_escaped = escaped_from_raw_str8(scratch.arena, string);
+  String8 string_normalized = path_normalized_from_string(scratch.arena, string);
+  String8 string_escaped = escaped_from_raw_str8(scratch.arena, string_normalized);
   String8 result = push_str8f(arena, "file:\"%S\"", string_escaped);
   scratch_end(scratch);
   return result;