jimzah/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2024-11-27 07:32:44 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

getenv: remove unnessary small key block

Browse Source 
The code removed does unnecessary copying in order to create a null-terminated pointer, just to pass it to libc getenv. It only does this for `small keys`, which are under 64 bytes in size.

Instead of going out of the way to add a null byte to a function that takes normal slices, this should just be handled by the loop below, which scans c.environ to find the value
This commit is contained in:
Mathew R Gordon 2023-07-17 08:16:17 -06:00 committed by Isaac Freund
parent a0b35249a2
commit 11695745e5
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/std/os.zig
View File

@ -1910,15 +1910,6 @@ pub fn execvpeZ(
/// See also `getenvZ`. /// See also `getenvZ`.
pub fn getenv(key: []const u8) ?[:0]const u8 { pub fn getenv(key: []const u8) ?[:0]const u8 {
if (builtin.link_libc) { if (builtin.link_libc) {
// Append null byte to the key to use with cstd getenv
var small_key_buf: [64]u8 = undefined;
if (key.len < small_key_buf.len) {
@memcpy(small_key_buf[0..key.len], key);
small_key_buf[key.len] = 0;
return getenvZ(small_key_buf[0..key.len :0]);
}
// Search the entire `environ` because we don't have a null terminated pointer.
var ptr = std.c.environ; var ptr = std.c.environ;
while (ptr[0]) |line| : (ptr += 1) { while (ptr[0]) |line| : (ptr += 1) {
var line_i: usize = 0; var line_i: usize = 0;