diff options
| -rw-r--r-- | process.c | 14 |
1 files changed, 5 insertions, 9 deletions
@@ -29,7 +29,7 @@ struct process * add_process(pid_t pid, unsigned long int trace_options) { struct process *proc; - int status; + int status, sig; proc = calloc(1, sizeof(*proc)); if (!proc) @@ -46,22 +46,18 @@ add_process(pid_t pid, unsigned long int trace_options) eprintf_and_kill(pid, "waitpid %ju <buffer> WSTOPPED:", (uintmax_t)pid); } - switch (status) { - case __W_STOPCODE(SIGSTOP): + sig = WIFSTOPPED(status) ? WSTOPSIG(status) : 0; + if (sig == SIGSTOP) { if (ptrace(PTRACE_SEIZE, pid, 0, trace_options)) eprintf_and_kill(pid, "ptrace PTRACE_SEIZE %ju 0 ...:", (uintmax_t)pid); if (ptrace(PTRACE_INTERRUPT, pid, NULL, 0)) eprintf_and_kill(pid, "ptrace PTRACE_INTERRUPT %ju NULL 0:", (uintmax_t)pid); if (kill(pid, SIGCONT) < 0) eprintf_and_kill(pid, "kill &ju SIGCONT:", (uintmax_t)pid); - break; - - case __W_STOPCODE(SIGTRAP) | (PTRACE_EVENT_STOP << 16): + } else if (sig == SIGTRAP && status & PTRACE_EVENT_STOP << 16) { if (ptrace(PTRACE_SYSCALL, pid, NULL, 0)) eprintf_and_kill(pid, "ptrace PTRACE_SYSCALL %ju NULL 0:", (uintmax_t)pid); - break; - - default: + } else { eprintf_and_kill(pid, "unexpected return of waitpid %ju <buffer> WSTOPPED: %#x\n", (uintmax_t)pid, status); } |