diff options
| author | Jeroen van Rijn <Kelimion@users.noreply.github.com> | 2023-06-27 20:54:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-27 20:54:49 +0200 |
| commit | 71bc4527640305ea095868fe1ef1069f9da3a4fb (patch) | |
| tree | b25f49e33b36c68be3a35de7754d710efd48caa8 | |
| parent | a820246f64b4c84bd82714551ae46c0e61e5cbe3 (diff) | |
| parent | f048ad13b52d3c2be2fcd975f1039eb88604360f (diff) | |
Merge pull request #2611 from GoNZooo/gonz.add-unix-setenv
fix(os): use `setenv` instead of `putenv`
| -rw-r--r-- | core/os/os_linux.odin | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/os/os_linux.odin b/core/os/os_linux.odin index e0b60fd36..1a4c1fddb 100644 --- a/core/os/os_linux.odin +++ b/core/os/os_linux.odin @@ -458,6 +458,7 @@ foreign libc { @(link_name="execvp") _unix_execvp :: proc(path: cstring, argv: [^]cstring) -> int --- @(link_name="getenv") _unix_getenv :: proc(cstring) -> cstring --- @(link_name="putenv") _unix_putenv :: proc(cstring) -> c.int --- + @(link_name="setenv") _unix_setenv :: proc(key: cstring, value: cstring, overwrite: c.int) -> c.int --- @(link_name="realpath") _unix_realpath :: proc(path: cstring, resolved_path: rawptr) -> rawptr --- @(link_name="exit") _unix_exit :: proc(status: c.int) -> ! --- @@ -893,8 +894,10 @@ get_env :: proc(key: string, allocator := context.allocator) -> (value: string) set_env :: proc(key, value: string) -> Errno { runtime.DEFAULT_TEMP_ALLOCATOR_TEMP_GUARD() - s := strings.concatenate({key, "=", value, "\x00"}, context.temp_allocator) - res := _unix_putenv(strings.unsafe_string_to_cstring(s)) + key_cstring := strings.clone_to_cstring(key, context.temp_allocator) + value_cstring := strings.clone_to_cstring(value, context.temp_allocator) + // NOTE(GoNZooo): `setenv` instead of `putenv` because it copies both key and value more commonly + res := _unix_setenv(key_cstring, value_cstring, 1) if res < 0 { return Errno(get_last_error()) } |