Switch to utmpx

Signed-off-by: AnErrupTion <anerruption@disroot.org>
This commit is contained in:
AnErrupTion
2024-07-27 23:39:09 +02:00
parent 1df890b238
commit 2bc12549a1
2 changed files with 9 additions and 8 deletions

View File

@@ -1,5 +1,6 @@
const std = @import("std"); const std = @import("std");
const build_options = @import("build_options"); const build_options = @import("build_options");
const builtin = @import("builtin");
const enums = @import("enums.zig"); const enums = @import("enums.zig");
const interop = @import("interop.zig"); const interop = @import("interop.zig");
const TerminalBuffer = @import("tui/TerminalBuffer.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 Config = @import("config/Config.zig");
const Allocator = std.mem.Allocator; const Allocator = std.mem.Allocator;
const utmp = interop.utmp; const utmp = interop.utmp;
const Utmp = utmp.utmp; const Utmp = utmp.utmpx;
const SharedError = @import("SharedError.zig"); const SharedError = @import("SharedError.zig");
var xorg_pid: std.posix.pid_t = 0; 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; entry.ut_addr_v6[0] = 0;
utmp.setutent(); utmp.setutxent();
_ = utmp.pututline(entry); _ = utmp.pututxline(entry);
utmp.endutent(); utmp.endutxent();
} }
fn removeUtmpEntry(entry: *Utmp) void { fn removeUtmpEntry(entry: *Utmp) void {
entry.ut_type = utmp.DEAD_PROCESS; entry.ut_type = utmp.DEAD_PROCESS;
entry.ut_line[0] = 0; entry.ut_line[0] = 0;
entry.ut_user[0] = 0; entry.ut_user[0] = 0;
utmp.setutent(); utmp.setutxent();
_ = utmp.pututline(entry); _ = utmp.pututxline(entry);
utmp.endutent(); utmp.endutxent();
} }
fn pamDiagnose(status: c_int) anyerror { fn pamDiagnose(status: c_int) anyerror {

View File

@@ -9,7 +9,7 @@ pub const pam = @cImport({
}); });
pub const utmp = @cImport({ pub const utmp = @cImport({
@cInclude("utmp.h"); @cInclude("utmpx.h");
}); });
pub const xcb = @cImport({ pub const xcb = @cImport({