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

tweaks per laytan suggestions

Browse Source
This commit is contained in:
Colin Davidson
2024-12-01 11:54:50 +11:00
committed by flysand7
parent fc9983e9c8
commit 8875921ec7
11 changed files with 33 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/time/timezone/tz_unix.odin
+5 -3
View File
@@ -11,7 +11,7 @@ local_tz_name :: proc(allocator := context.allocator) -> (name: string, success:
local_str, ok := os.lookup_env("TZ", allocator)
if !ok {
orig_localtime_path := "/etc/localtime"
path, err := os.absolute_path_from_relative(orig_localtime_path)
path, err := os.absolute_path_from_relative(orig_localtime_path, allocator)
if err != nil {
// If we can't find /etc/localtime, fallback to UTC
if err == .ENOENT {
@@ -22,11 +22,11 @@ local_tz_name :: proc(allocator := context.allocator) -> (name: string, success:
return
}
defer delete(path)
defer delete(path, allocator)
// FreeBSD makes me sad.
if path == orig_localtime_path {
data := os.read_entire_file("/var/db/zoneinfo") or_return
data := os.read_entire_file("/var/db/zoneinfo", allocator) or_return
return strings.trim_right_space(string(data)), true
}
@@ -52,6 +52,8 @@ local_tz_name :: proc(allocator := context.allocator) -> (name: string, success:
}
if local_str == "" {
delete(local_str)
str, err := strings.clone("UTC", allocator)
if err != nil { return }
return str, true