From d06f8e49b45cd4a491f271c18b5b6401a714fdc7 Mon Sep 17 00:00:00 2001 From: Kinzie Date: Sun, 21 Apr 2024 22:50:01 +0100 Subject: [PATCH] migrator changes, and small things --- src/auth.zig | 5 ++--- src/config/migrator.zig | 10 ++-------- src/main.zig | 4 ++-- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/auth.zig b/src/auth.zig index f5287bc..c9ff891 100644 --- a/src/auth.zig +++ b/src/auth.zig @@ -179,12 +179,12 @@ fn setXdgSessionEnv(display_server: enums.DisplayServer) void { }, 0); } -fn setXdgEnv(tty_str: [:0]u8, desktop_name: [:0]const u8, desktop_names: [:0]const u8) !void { +fn setXdgEnv(tty_str: [:0]u8, desktop_name: [:0]const u8, xdg_desktop_names: [:0]const u8) !void { const uid = interop.getuid(); var uid_buffer: [10 + @sizeOf(u32) + 1]u8 = undefined; const uid_str = try std.fmt.bufPrintZ(&uid_buffer, "/run/user/{d}", .{uid}); - _ = interop.setenv("XDG_CURRENT_DESKTOP", desktop_names.ptr, 0); + _ = interop.setenv("XDG_CURRENT_DESKTOP", xdg_desktop_names.ptr, 0); _ = interop.setenv("XDG_RUNTIME_DIR", uid_str.ptr, 0); _ = interop.setenv("XDG_SESSION_CLASS", "user", 0); _ = interop.setenv("XDG_SESSION_ID", "1", 0); @@ -407,7 +407,6 @@ fn executeX11Cmd(shell: [*:0]const u8, pw_dir: [*:0]const u8, config: Config, de interop.xcb.xcb_disconnect(xcb); std.posix.kill(x_pid, 0) catch return; - std.posix.kill(x_pid, std.posix.SIG.TERM) catch {}; var status: c_int = 0; diff --git a/src/config/migrator.zig b/src/config/migrator.zig index b41128c..0ae6001 100644 --- a/src/config/migrator.zig +++ b/src/config/migrator.zig @@ -2,10 +2,10 @@ const std = @import("std"); const ini = @import("zigini"); const Save = @import("Save.zig"); -pub fn tryMigrateSaveFile(user_buf: *[32]u8, old_path: []const u8, new_path: []const u8) Save { +pub fn tryMigrateSaveFile(user_buf: *[32]u8, path: []const u8) Save { var save = Save{}; - var file = std.fs.openFileAbsolute(old_path, .{}) catch return save; + var file = std.fs.openFileAbsolute(path, .{}) catch return save; defer file.close(); const reader = file.reader(); @@ -26,11 +26,5 @@ pub fn tryMigrateSaveFile(user_buf: *[32]u8, old_path: []const u8, new_path: []c } save.session_index = session_index; - const new_save_file = std.fs.cwd().createFile(new_path, .{}) catch return save; - ini.writeFromStruct(save, new_save_file.writer(), null) catch return save; - - // Delete old save file - std.fs.deleteFileAbsolute(old_path) catch {}; - return save; } diff --git a/src/main.zig b/src/main.zig index fef0afe..e713025 100644 --- a/src/main.zig +++ b/src/main.zig @@ -111,7 +111,7 @@ pub fn main() !void { save_path_alloc = true; var user_buf: [32]u8 = undefined; - save = save_ini.readFileToStruct(save_path) catch migrator.tryMigrateSaveFile(&user_buf, config.save_file, save_path); + save = save_ini.readFileToStruct(save_path) catch migrator.tryMigrateSaveFile(&user_buf, config.save_file); } } else { config = config_ini.readFileToStructWithMap(build_options.data_directory ++ "/config.ini", mapped_config_fields) catch Config{}; @@ -123,7 +123,7 @@ pub fn main() !void { if (config.load) { var user_buf: [32]u8 = undefined; - save = save_ini.readFileToStruct(save_path) catch migrator.tryMigrateSaveFile(&user_buf, config.save_file, save_path); + save = save_ini.readFileToStruct(save_path) catch migrator.tryMigrateSaveFile(&user_buf, config.save_file); } }