mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-04-25 15:53:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6012 from A1029384756/master

Browse Source 
[tz_unix] added additional search paths to match musl
This commit is contained in:
Laytan
2025-12-15 19:06:16 +01:00
committed by GitHub
parent cf5987d519 916ec44ad1
commit 77606168b9
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/time/timezone/tz_unix.odin
View File

@@ -81,9 +81,27 @@ _region_load :: proc(_reg_str: string, allocator := context.allocator) -> (out_r
}
defer if _reg_str == "local" { delete(reg_str, allocator) }
db_path := "/usr/share/zoneinfo"
region_path := filepath.join({db_path, reg_str}, allocator)
defer delete(region_path, allocator)
tzdir_str, tzdir_ok := os.lookup_env("TZDIR", allocator)
defer if tzdir_ok { delete(tzdir_str, allocator) }
return load_tzif_file(region_path, reg_str, allocator)
if tzdir_ok {
region_path := filepath.join({tzdir_str, reg_str}, allocator)
defer delete(region_path, allocator)
if tz_reg, ok := load_tzif_file(region_path, reg_str, allocator); ok {
return tz_reg, true
}
}
db_paths := []string{"/usr/share/zoneinfo", "/share/zoneinfo", "/etc/zoneinfo"}
for db_path in db_paths {
region_path := filepath.join({db_path, reg_str}, allocator)
defer delete(region_path, allocator)
if tz_reg, ok := load_tzif_file(region_path, reg_str, allocator); ok {
return tz_reg, true
}
}
return nil, false
}