From d00780d6ce7f1c9552f013a4180ddf4885e83f10 Mon Sep 17 00:00:00 2001 From: AnErrupTion Date: Wed, 8 Jul 2026 01:29:57 +0200 Subject: [PATCH] zig: Remove usage of [*c] Signed-off-by: AnErrupTion --- ly-core/src/interop.zig | 6 +++--- src/auth.zig | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ly-core/src/interop.zig b/ly-core/src/interop.zig index f04b2a4..d894485 100644 --- a/ly-core/src/interop.zig +++ b/ly-core/src/interop.zig @@ -28,7 +28,7 @@ pub const UsernameEntry = struct { gid: std.posix.gid_t, home: ?[]const u8, shell: ?[]const u8, - passwd_struct: [*c]pwd.passwd, + passwd_struct: [*]pwd.passwd, }; // Contains the platform-specific code @@ -381,8 +381,8 @@ pub fn setEnvironmentVariable(allocator: std.mem.Allocator, name: []const u8, va if (status != 0) return error.SetEnvironmentVariableFailed; } -pub fn putEnvironmentVariable(name_and_value: [*c]u8) !void { - const status = stdlib.putenv(name_and_value); +pub fn putEnvironmentVariable(name_and_value: []u8) !void { + const status = stdlib.putenv(name_and_value.ptr); if (status != 0) return error.PutEnvironmentVariableFailed; } diff --git a/src/auth.zig b/src/auth.zig index 00ae005..c9abf15 100644 --- a/src/auth.zig +++ b/src/auth.zig @@ -191,10 +191,12 @@ fn startSession( if (pam_env_vars == null) return error.GetEnvListFailed; const env_list = std.mem.span(pam_env_vars.?); - for (env_list) |env_var| { - if (env_var == null) continue; - try log_file.info(io, "auth/env", "setting pam environment variable: {s}", .{std.mem.span(env_var.?)}); - try interop.putEnvironmentVariable(env_var); + for (env_list) |maybe_env_var| { + if (maybe_env_var) |env_var| { + const env_var_slice = std.mem.span(env_var); + try log_file.info(io, "auth/env", "setting pam environment variable: {s}", .{env_var_slice}); + try interop.putEnvironmentVariable(env_var_slice); + } } const home_z = try allocator.dupeZ(u8, user_entry.home.?);