From 11695745e5c6cbd158625d2c1682a09e2ee4c679 Mon Sep 17 00:00:00 2001 From: Mathew R Gordon <72643694+mgord9518@users.noreply.github.com> Date: Mon, 17 Jul 2023 08:16:17 -0600 Subject: [PATCH] getenv: remove unnessary `small key` block 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 --- lib/std/os.zig | 9 --------- 1 file changed, 9 deletions(-) diff --git a/lib/std/os.zig b/lib/std/os.zig index ddfe4880ab..d5d75f0f59 100644 --- a/lib/std/os.zig +++ b/lib/std/os.zig @@ -1910,15 +1910,6 @@ pub fn execvpeZ( /// See also `getenvZ`. pub fn getenv(key: []const u8) ?[:0]const u8 { 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; while (ptr[0]) |line| : (ptr += 1) { var line_i: usize = 0;