diff options
Diffstat (limited to 'src/upgrade.zig')
| -rw-r--r-- | src/upgrade.zig | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/upgrade.zig b/src/upgrade.zig index 7819f216..97d3be4f 100644 --- a/src/upgrade.zig +++ b/src/upgrade.zig @@ -322,13 +322,13 @@ pub fn exec(gpa: std.mem.Allocator, path: ?[:0]const u8, old: c_int, rec: *const for (given, argv[2..]) |a, *slot| slot.* = a.ptr; rec.closeOnExec(false); const envp: [*:null]const ?[*:0]const u8 = @ptrCast(libc.environ); - const r = if (path) |p| - libc.execve(p, argv.ptr, envp) + // execveat by its syscall: musl (a static pardes) has no wrapper. + const e = if (path) |p| + libc.errno(libc.execve(p, argv.ptr, envp)) else if (comptime builtin.os.tag == .linux) - libc.execveat(old, "", argv.ptr, envp, .{ .SYMLINK_NOFOLLOW = false, .EMPTY_PATH = true }) + std.os.linux.errno(std.os.linux.execveat(old, "", argv.ptr, envp, .{ .SYMLINK_NOFOLLOW = false, .EMPTY_PATH = true })) else - -1; - const e = libc.errno(r); + libc.errno(@as(c_int, -1)); rec.closeOnExec(true); return switch (e) { .NOENT => "it is not there", |
