ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-05 15:18:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1003 from jockus/master

Browse Source 
Fix deleting substring in filepath.rel
This commit is contained in:
gingerBill
2021-05-27 13:35:46 +01:00
committed by GitHub
parent bb7bd94b0a b110153b51
commit b65e5d5e03
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/path/filepath/path.odin
+7 -7
View File
@@ -206,23 +206,23 @@ Relative_Error :: enum {
rel :: proc(base_path, target_path: string, allocator := context.allocator) -> (string, Relative_Error) { rel :: proc(base_path, target_path: string, allocator := context.allocator) -> (string, Relative_Error) {
context.allocator = allocator; context.allocator = allocator;
base_vol, target_vol := volume_name(base_path), volume_name(target_path); base_clean, target_clean := clean(base_path), clean(target_path);
base, target := clean(base_path), clean(target_path);
delete_target := true; delete_target := true;
defer { defer {
if delete_target { 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; return strings.clone("."), .None;
} }
base = base[len(base_vol):]; base_vol, target_vol := volume_name(base_path), volume_name(target_path);
target = target[len(target_vol):]; base := base_clean[len(base_vol):];
target := target_clean[len(target_vol):];
if base == "." { if base == "." {
base = ""; base = "";
} }