diff options
author | delphij <delphij@FreeBSD.org> | 2009-04-13 16:23:32 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2009-04-13 16:23:32 +0000 |
commit | feaa2ee03c5dc83faf4a90b3352bb31fb9cdba72 (patch) | |
tree | 036b901eec94bed5791737623449cc217af9e99d /usr.bin | |
parent | 882a2894c360c6d9b7355f9bfc039e76cfb83b53 (diff) | |
download | FreeBSD-src-feaa2ee03c5dc83faf4a90b3352bb31fb9cdba72.zip FreeBSD-src-feaa2ee03c5dc83faf4a90b3352bb31fb9cdba72.tar.gz |
Don't exit until all truss children were exit.
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/truss/main.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/usr.bin/truss/main.c b/usr.bin/truss/main.c index 54f7ee8..9c1589b 100644 --- a/usr.bin/truss/main.c +++ b/usr.bin/truss/main.c @@ -1,4 +1,4 @@ -/* +/*- * Copryight 1997 Sean Eric Fagan * * Redistribution and use in source and binary forms, with or without @@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$"); #include <sys/time.h> #include <sys/resource.h> #include <sys/sysctl.h> +#include <sys/wait.h> #include <ctype.h> #include <err.h> @@ -164,6 +165,8 @@ main(int ac, char **av) { int c; int i; + pid_t childpid; + int status; char **command; struct ex_types *funcs; int initial_open; @@ -288,8 +291,6 @@ START_TRACE: if (trussinfo->curthread->in_fork && (trussinfo->flags & FOLLOWFORKS)) { - int childpid; - trussinfo->curthread->in_fork = 0; childpid = funcs->exit_syscall(trussinfo, @@ -360,6 +361,11 @@ START_TRACE: } } while (trussinfo->pr_why != S_EXIT); fflush(trussinfo->outfile); - + + if (trussinfo->flags & FOLLOWFORKS) + do { + childpid = wait(&status); + } while (childpid != -1); + return (0); } |