Zander671/river
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

command/spawn: use _exit(2) instead of exit(3)

Browse Source 
Something in exit(3) is causing the intermediate fork to segfault.
This commit is contained in:
Isaac Freund 2020-07-12 12:16:05 +02:00
parent 8120829e5c
commit f3d4e5ac53
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
river/command/spawn.zig
View File

@ -48,15 +48,17 @@ pub fn spawn(
if (c.setsid() < 0) unreachable; if (c.setsid() < 0) unreachable;
if (std.os.system.sigprocmask(std.os.SIG_SETMASK, &std.os.empty_sigset, null) < 0) unreachable; if (std.os.system.sigprocmask(std.os.SIG_SETMASK, &std.os.empty_sigset, null) < 0) unreachable;
const pid2 = std.os.fork() catch std.os.exit(1); const pid2 = std.os.fork() catch c._exit(1);
if (pid2 == 0) std.os.execveZ("/bin/sh", &child_args, std.c.environ) catch std.os.exit(1); if (pid2 == 0) std.os.execveZ("/bin/sh", &child_args, std.c.environ) catch c._exit(1);
std.os.exit(0); c._exit(0);
} }
// Wait the intermediate child. // Wait the intermediate child.
const status = std.os.waitpid(pid, 0); const status = std.os.waitpid(pid, 0);
if (std.os.WIFEXITED(status) and std.os.WEXITSTATUS(status) != 0) { if (!std.os.WIFEXITED(status) or
(std.os.WIFEXITED(status) and std.os.WEXITSTATUS(status) != 0))
{
out.* = try std.fmt.allocPrint(allocator, "fork/execve failed", .{}); out.* = try std.fmt.allocPrint(allocator, "fork/execve failed", .{});
return Error.Other; return Error.Other;
} }