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

Fix filepath.rel allocation behaviour

Browse Source
This commit is contained in:
gingerBill
2024-02-06 23:39:20 +00:00
parent df5ee2dd06
commit 4035a226da
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/path/filepath/path.odin
+11 -16
View File
@@ -356,28 +356,24 @@ 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_clean, target_clean := clean(base_path), clean(target_path) base_clean := clean(base_path, allocator)
target_clean := clean(target_path, allocator)
delete_target := true defer delete(base_clean, allocator)
defer { defer delete(target_clean, allocator)
if delete_target {
delete(target_clean)
}
delete(base_clean)
}
if strings.equal_fold(target_clean, base_clean) { if strings.equal_fold(target_clean, base_clean) {
return strings.clone("."), .None return strings.clone(".", allocator), .None
} }
base_vol, target_vol := volume_name(base_path), volume_name(target_path) base_vol := volume_name(base_path)
base := base_clean[len(base_vol):] target_vol := volume_name(target_path)
base := base_clean [len(base_vol):]
target := target_clean[len(target_vol):] target := target_clean[len(target_vol):]
if base == "." { if base == "." {
base = "" base = ""
} }
base_slashed := len(base) > 0 && base[0] == SEPARATOR base_slashed := len(base) > 0 && base [0] == SEPARATOR
target_slashed := len(target) > 0 && target[0] == SEPARATOR target_slashed := len(target) > 0 && target[0] == SEPARATOR
if base_slashed != target_slashed || !strings.equal_fold(base_vol, target_vol) { if base_slashed != target_slashed || !strings.equal_fold(base_vol, target_vol) {
return "", .Cannot_Relate return "", .Cannot_Relate
@@ -413,7 +409,7 @@ rel :: proc(base_path, target_path: string, allocator := context.allocator) -> (
if tl != t0 { if tl != t0 {
size += 1 + tl - t0 size += 1 + tl - t0
} }
buf := make([]byte, size) buf := make([]byte, size, allocator)
n := copy(buf, "..") n := copy(buf, "..")
for _ in 0..<seps { for _ in 0..<seps {
buf[n] = SEPARATOR buf[n] = SEPARATOR
@@ -427,8 +423,7 @@ rel :: proc(base_path, target_path: string, allocator := context.allocator) -> (
return string(buf), .None return string(buf), .None
} }
delete_target = false return strings.clone(target[t0:], allocator), .None
return target[t0:], .None
} }
/* /*