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

Fix deleting substring in filepath.release

Browse Source
This commit is contained in:
jockus
2021-05-27 12:01:13 +01:00
parent c85c5ec38c
commit e8aa767c8d
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/path/filepath/path.odin
+8 -8
View File
@@ -2,6 +2,7 @@
// To process paths usch as URLs that depend on forward slashes regardless of the OS, use the path package // To process paths usch as URLs that depend on forward slashes regardless of the OS, use the path package
package filepath package filepath
import "core:fmt"
import "core:strings" import "core:strings"
// is_separator checks whether the byte is a valid separator character // is_separator checks whether the byte is a valid separator character
@@ -206,23 +207,22 @@ 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_clean, base_clean) {
if strings.equal_fold(target, base) {
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 = "";
} }