mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-02-24 11:54:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/odin-lang/Odin

Browse Source
This commit is contained in:
gingerBill
2021-05-27 14:46:10 +01:00
parent 7d304f4e8b b65e5d5e03
commit 8cfdd9805d
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/path/filepath/path.odin
View File

@@ -206,23 +206,23 @@ Relative_Error :: enum {
rel :: proc(base_path, target_path: string, allocator := context.allocator) -> (string, Relative_Error) {
context.allocator = allocator;
base_vol, target_vol := volume_name(base_path), volume_name(target_path);
base, target := clean(base_path), clean(target_path);
base_clean, target_clean := clean(base_path), clean(target_path);
delete_target := true;
defer {
if delete_target {
delete(target);
delete(target_clean);
}
delete(base);
delete(base_clean);
}
if strings.equal_fold(target, base) {
if strings.equal_fold(target_clean, base_clean) {
return strings.clone("."), .None;
}
base = base[len(base_vol):];
target = target[len(target_vol):];
base_vol, target_vol := volume_name(base_path), volume_name(target_path);
base := base_clean[len(base_vol):];
target := target_clean[len(target_vol):];
if base == "." {
base = "";
}