From 2bc12549a18db544ac5515998c331b2e2be18742 Mon Sep 17 00:00:00 2001 From: AnErrupTion Date: Sat, 27 Jul 2024 23:39:09 +0200 Subject: [PATCH] Switch to utmpx Signed-off-by: AnErrupTion --- src/auth.zig | 15 ++++++++------- src/interop.zig | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/auth.zig b/src/auth.zig index d0f619d..bab791f 100644 --- a/src/auth.zig +++ b/src/auth.zig @@ -1,5 +1,6 @@ const std = @import("std"); const build_options = @import("build_options"); +const builtin = @import("builtin"); const enums = @import("enums.zig"); const interop = @import("interop.zig"); const TerminalBuffer = @import("tui/TerminalBuffer.zig"); @@ -8,7 +9,7 @@ const Text = @import("tui/components/Text.zig"); const Config = @import("config/Config.zig"); const Allocator = std.mem.Allocator; const utmp = interop.utmp; -const Utmp = utmp.utmp; +const Utmp = utmp.utmpx; const SharedError = @import("SharedError.zig"); var xorg_pid: std.posix.pid_t = 0; @@ -486,18 +487,18 @@ fn addUtmpEntry(entry: *Utmp, username: [*:0]const u8, pid: c_int) !void { }; entry.ut_addr_v6[0] = 0; - utmp.setutent(); - _ = utmp.pututline(entry); - utmp.endutent(); + utmp.setutxent(); + _ = utmp.pututxline(entry); + utmp.endutxent(); } fn removeUtmpEntry(entry: *Utmp) void { entry.ut_type = utmp.DEAD_PROCESS; entry.ut_line[0] = 0; entry.ut_user[0] = 0; - utmp.setutent(); - _ = utmp.pututline(entry); - utmp.endutent(); + utmp.setutxent(); + _ = utmp.pututxline(entry); + utmp.endutxent(); } fn pamDiagnose(status: c_int) anyerror { diff --git a/src/interop.zig b/src/interop.zig index b378f34..972cce4 100644 --- a/src/interop.zig +++ b/src/interop.zig @@ -9,7 +9,7 @@ pub const pam = @cImport({ }); pub const utmp = @cImport({ - @cInclude("utmp.h"); + @cInclude("utmpx.h"); }); pub const xcb = @cImport({