mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-02-12 14:23:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #6265

Browse Source
This commit is contained in:
Jeroen van Rijn
2026-02-12 13:55:17 +01:00
parent 90923272b3
commit 1159110e73
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -251,15 +251,22 @@ rel :: proc(base_path, target_path: string, allocator := context.allocator) -> (
*/
dir :: proc(path: string, allocator := context.allocator) -> string {
context.allocator = allocator
vol := volume_name(path)
vol_len := len(volume_name(path))
when ODIN_OS == .Windows {
if len(path) >= 3 && is_separator(path[2]) {
vol_len += 1
}
}
vol := path[:vol_len]
i := len(path) - 1
for i >= len(vol) && !is_separator(path[i]) {
for i >= vol_len && !is_separator(path[i]) {
i -= 1
}
dir, dir_err := clean(path[len(vol) : i+1], allocator)
dir, dir_err := clean(path[vol_len : i+1], allocator)
if dir_err != nil { return "" }
defer delete(dir)
if dir == "." && len(vol) > 2 {
if dir == "." && vol_len > 2 {
return strings.clone(vol)
}
return strings.concatenate({vol, dir})