Browse Source

Fix a few bugs in path based code.

Trying to use path.dir and path.rel I found these two issues with the implementation.
Clay Murray 4 years ago
parent
commit
062ae56f25
1 changed files with 2 additions and 2 deletions
  1. 2 2
      core/path/filepath/path.odin

+ 2 - 2
core/path/filepath/path.odin

@@ -241,7 +241,7 @@ rel :: proc(base_path, target_path: string, allocator := context.allocator) -> (
 		for ti < tl && target[ti] != SEPARATOR {
 		for ti < tl && target[ti] != SEPARATOR {
 			ti += 1;
 			ti += 1;
 		}
 		}
-		if !strings.equal_fold(target[t0:ti], base[t0:ti]) {
+		if !strings.equal_fold(target[t0:ti], base[b0:bi]) {
 			break;
 			break;
 		}
 		}
 		if bi < bl {
 		if bi < bl {
@@ -284,7 +284,7 @@ rel :: proc(base_path, target_path: string, allocator := context.allocator) -> (
 dir :: proc(path: string, allocator := context.allocator) -> string {
 dir :: proc(path: string, allocator := context.allocator) -> string {
 	vol := volume_name(path);
 	vol := volume_name(path);
 	i := len(path) - 1;
 	i := len(path) - 1;
-	for i >= len(vol) && is_separator(path[i]) {
+	for i >= len(vol) && !is_separator(path[i]) {
 		i -= 1;
 		i -= 1;
 	}
 	}
 	dir := clean(path[len(vol) : i+1], allocator);
 	dir := clean(path[len(vol) : i+1], allocator);