Simple fixes.
* strace.c (usage): Document -d; document that -F is deprecated.
(droptcb): Print "<detached ...>" correctly for non-ff mode too.
(detach): Suppress a warning.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
diff --git a/strace.c b/strace.c
index c285656..2c5c1b4 100644
--- a/strace.c
+++ b/strace.c
@@ -166,9 +166,10 @@
[PROG [ARGS]]\n\
-c -- count time, calls, and errors for each syscall and report summary\n\
-C -- like -c but also print regular output while processes are running\n\
+-d -- enable debug output to stderr\n\
-D -- run tracer process as a detached grandchild, not as parent\n\
-f -- follow forks, -ff -- with output into separate files\n\
--F -- attempt to follow vforks\n\
+-F -- attempt to follow vforks (deprecated, use -f)\n\
-i -- print instruction pointer at time of syscall\n\
-I interruptible\n\
1: no signals are blocked\n\
@@ -1547,17 +1548,23 @@
if (debug_flag)
fprintf(stderr, "dropped tcb for pid %d, %d remain\n", tcp->pid, nprocs);
+ if (tcp->outf) {
+ if (outfname && followfork >= 2) {
+ if (tcp->curcol != 0)
+ fprintf(tcp->outf, " <detached ...>\n");
+ fclose(tcp->outf);
+ if (outf == tcp->outf)
+ outf = NULL;
+ } else {
+ if (printing_tcp == tcp && tcp->curcol != 0)
+ fprintf(tcp->outf, " <detached ...>\n");
+ fflush(tcp->outf);
+ }
+ }
+
if (printing_tcp == tcp)
printing_tcp = NULL;
- if (outfname && followfork >= 2 && tcp->outf) {
- if (tcp->curcol != 0)
- fprintf(tcp->outf, " <detached>\n");
- fclose(tcp->outf);
- } else if (tcp->outf) {
- fflush(tcp->outf);
- }
-
memset(tcp, 0, sizeof(*tcp));
}
@@ -1585,6 +1592,7 @@
#define PTRACE_DETACH PTRACE_SUNDETACH
#endif
+ error = 0;
sigstop_expected = 0;
if (tcp->flags & TCB_ATTACHED) {
/*