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

Merge pull request #1804 from wjlroe/consistent-os-get-env-across-unix

Browse Source 
[os] Darwin,FreeBSD,OpenBSD: Rename os.getenv to os.get_env
This commit is contained in:
Jeroen van Rijn
2022-05-23 15:57:39 +02:00
committed by GitHub
parent cc1df9591f 54a326f046
commit a8d78660ee
3 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/os/os_darwin.odin
+8 -3
View File
@@ -633,13 +633,18 @@ heap_free :: proc(ptr: rawptr) {
_unix_free(ptr) _unix_free(ptr)
} }
getenv :: proc(name: string) -> (string, bool) { lookup_env :: proc(key: string, allocator := context.allocator) -> (value: string, found: bool) {
path_str := strings.clone_to_cstring(name, context.temp_allocator) path_str := strings.clone_to_cstring(key, context.temp_allocator)
cstr := _unix_getenv(path_str) cstr := _unix_getenv(path_str)
if cstr == nil { if cstr == nil {
return "", false return "", false
} }
return string(cstr), true return strings.clone(string(cstr), allocator), true
}
get_env :: proc(key: string, allocator := context.allocator) -> (value: string) {
value, _ = lookup_env(key, allocator)
return
} }
get_current_directory :: proc() -> string { get_current_directory :: proc() -> string {
core/os/os_freebsd.odin
+8 -3
View File
@@ -618,13 +618,18 @@ heap_free :: proc(ptr: rawptr) {
_unix_free(ptr) _unix_free(ptr)
} }
getenv :: proc(name: string) -> (string, bool) { lookup_env :: proc(key: string, allocator := context.allocator) -> (value: string, found: bool) {
path_str := strings.clone_to_cstring(name, context.temp_allocator) path_str := strings.clone_to_cstring(key, context.temp_allocator)
cstr := _unix_getenv(path_str) cstr := _unix_getenv(path_str)
if cstr == nil { if cstr == nil {
return "", false return "", false
} }
return string(cstr), true return strings.clone(string(cstr), allocator), true
}
get_env :: proc(key: string, allocator := context.allocator) -> (value: string) {
value, _ = lookup_env(key, allocator)
return
} }
get_current_directory :: proc() -> string { get_current_directory :: proc() -> string {
core/os/os_openbsd.odin
+8 -3
View File
@@ -620,13 +620,18 @@ heap_free :: proc(ptr: rawptr) {
_unix_free(ptr) _unix_free(ptr)
} }
getenv :: proc(name: string) -> (string, bool) { lookup_env :: proc(key: string, allocator := context.allocator) -> (value: string, found: bool) {
path_str := strings.clone_to_cstring(name, context.temp_allocator) path_str := strings.clone_to_cstring(key, context.temp_allocator)
cstr := _unix_getenv(path_str) cstr := _unix_getenv(path_str)
if cstr == nil { if cstr == nil {
return "", false return "", false
} }
return string(cstr), true return strings.clone(string(cstr), allocator), true
}
get_env :: proc(key: string, allocator := context.allocator) -> (value: string) {
value, _ = lookup_env(key, allocator)
return
} }
get_current_directory :: proc() -> string { get_current_directory :: proc() -> string {