neurocyte/flow
neurocyte/flow
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: search path for flow when restarting

Browse source 
If argv[0] is not an absolute or relative path.
This commit is contained in:
CJ van den Berg 2024-12-06 21:06:04 +01:00
parent dbab84d069
commit 3b4687761e
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main.zig
View file

@ -4,6 +4,7 @@ const thespian = @import("thespian");
const flags = @import("flags"); const flags = @import("flags");
const builtin = @import("builtin"); const builtin = @import("builtin");
const bin_path = @import("bin_path.zig");
const list_languages = @import("list_languages.zig"); const list_languages = @import("list_languages.zig");
const c = @cImport({ const c = @cImport({
@ -666,12 +667,21 @@ pub fn get_keybind_namespace_file_name(namespace_name: []const u8) ![]const u8 {
} }
fn restart() noreturn { fn restart() noreturn {
var executable: [:0]const u8 = std.mem.span(std.os.argv[0]);
var is_basename = true;
for (executable) |char| if (std.fs.path.isSep(char)) {
is_basename = false;
};
if (is_basename) {
const a = std.heap.c_allocator;
executable = bin_path.find_binary_in_path(a, executable) catch executable orelse executable;
}
const argv = [_]?[*:0]const u8{ const argv = [_]?[*:0]const u8{
std.os.argv[0], executable,
"--restore-session", "--restore-session",
null, null,
}; };
const ret = std.c.execve(std.os.argv[0], @ptrCast(&argv), @ptrCast(std.os.environ)); const ret = std.c.execve(executable, @ptrCast(&argv), @ptrCast(std.os.environ));
std.io.getStdErr().writer().print("\nrestart failed: {d}", .{ret}) catch {}; std.io.getStdErr().writer().print("\nrestart failed: {d}", .{ret}) catch {};
exit(234); exit(234);
} }