berkus
/
essence-os
mirror of https://gitlab.com/nakst/essence
1
0
Fork 0
Code Releases Activity

return exit status in change_sysroot

This commit is contained in:
nakst 2021-12-15 10:45:02 +00:00
parent 7791069281
commit e95c9fb15f
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
util/change_sysroot.c
View File

@ -100,7 +100,7 @@ int main(int argc, char **argv) {
basePID = pid; basePID = pid;
} }
while (kill(basePID, 0) == 0 /* still alive */) { while (true) {
struct user_regs_struct registers = { 0 }; struct user_regs_struct registers = { 0 };
pid_t pid = waitpid(-1, 0, 0); pid_t pid = waitpid(-1, 0, 0);
@ -161,15 +161,18 @@ int main(int argc, char **argv) {
printf("unhandled syscall %llu\n", registers.orig_rax); printf("unhandled syscall %llu\n", registers.orig_rax);
} }
int status;
ptrace(PTRACE_SYSCALL, pid, 0, 0); ptrace(PTRACE_SYSCALL, pid, 0, 0);
waitpid(pid, 0, 0); waitpid(pid, &status, 0);
if (ptrace(PTRACE_GETREGS, pid, 0, &registers) == -1) { if (ptrace(PTRACE_GETREGS, pid, 0, &registers) == -1) {
// The process has likely exited. // The process has exited.
if (pid == basePID) {
return WEXITSTATUS(status);
}
} else { } else {
ptrace(PTRACE_SYSCALL, pid, 0, 0); ptrace(PTRACE_SYSCALL, pid, 0, 0);
} }
} }
return 0;
} }