glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

strace.c: print correct out file name in error messages in case of -ff

Browse Source 
* strace.c (outf_perror): New function.
(tvprintf, tprints, flush_tcp_output): Use it.
This commit is contained in:
Eugene Syromyatnikov 2018-01-16 14:36:06 +01:00 committed by Dmitry V. Levin
parent 4af6378100
commit 0918b3145c
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
strace.c
View File

@ -533,6 +533,19 @@ strace_popen(const char *command)
return fp;
}
static void
outf_perror(const struct tcb * const tcp)
{
if (tcp->outf == stderr)
return;
/* This is ugly, but we don't store separate file names */
if (followfork >= 2)
perror_msg("%s.%u", outfname, tcp->pid);
else
perror_msg("%s", outfname);
}
ATTRIBUTE_FORMAT((printf, 1, 0))
static void
tvprintf(const char *const fmt, va_list args)
@ -541,8 +554,7 @@ tvprintf(const char *const fmt, va_list args)
int n = vfprintf(current_tcp->outf, fmt, args);
if (n < 0) {
/* very unlikely due to vfprintf buffering */
if (current_tcp->outf != stderr)
perror_msg("%s", outfname);
outf_perror(current_tcp);
} else
current_tcp->curcol += n;
}
@ -571,8 +583,7 @@ tprints(const char *str)
return;
}
/* very unlikely due to fputs_unlocked buffering */
if (current_tcp->outf != stderr)
perror_msg("%s", outfname);
outf_perror(current_tcp);
}
}
@ -600,8 +611,8 @@ tprintf_comment(const char *fmt, ...)
static void
flush_tcp_output(const struct tcb *const tcp)
{
if (fflush(tcp->outf) && tcp->outf != stderr)
perror_msg("%s", outfname);
if (fflush(tcp->outf))
outf_perror(tcp);
}
void