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

strace.c: use xsprintf instead of sprintf

Browse Source 
* strace.c: Include "xstring.h".
(strerror, newoutf, attach_tcb, print_debug_info): Replace sprintf
with xsprintf.
This commit is contained in:
Дмитрий Левин 2018-01-05 01:18:05 +00:00
parent 5f1eafe8e4
commit 026b76444e
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
strace.c
View File

@ -51,6 +51,7 @@
#include "ptrace.h" #include "ptrace.h"
#include "printsiginfo.h" #include "printsiginfo.h"
#include "trace_event.h" #include "trace_event.h"
#include "xstring.h"
/* In some libc, these aren't declared. Do it ourself: */ /* In some libc, these aren't declared. Do it ourself: */
extern char **environ; extern char **environ;
@ -185,7 +186,7 @@ strerror(int err_no)
static char buf[sizeof("Unknown error %d") + sizeof(int)*3]; static char buf[sizeof("Unknown error %d") + sizeof(int)*3];
if (err_no < 1 || err_no >= sys_nerr) { if (err_no < 1 || err_no >= sys_nerr) {
sprintf(buf, "Unknown error %d", err_no); xsprintf(buf, "Unknown error %d", err_no);
return buf; return buf;
} }
return sys_errlist[err_no]; return sys_errlist[err_no];
@ -674,7 +675,7 @@ newoutf(struct tcb *tcp)
tcp->outf = shared_log; /* if not -ff mode, the same file is for all */ tcp->outf = shared_log; /* if not -ff mode, the same file is for all */
if (followfork >= 2) { if (followfork >= 2) {
char name[PATH_MAX]; char name[PATH_MAX];
sprintf(name, "%s.%u", outfname, tcp->pid); xsprintf(name, "%s.%u", outfname, tcp->pid);
tcp->outf = strace_fopen(name); tcp->outf = strace_fopen(name);
} }
} }
@ -1013,7 +1014,7 @@ attach_tcb(struct tcb *const tcp)
unsigned int ntid = 0, nerr = 0; unsigned int ntid = 0, nerr = 0;
if (followfork && tcp->pid != strace_child && if (followfork && tcp->pid != strace_child &&
sprintf(procdir, "/proc/%d/task", tcp->pid) > 0 && xsprintf(procdir, "/proc/%d/task", tcp->pid) > 0 &&
(dir = opendir(procdir)) != NULL) { (dir = opendir(procdir)) != NULL) {
struct_dirent *de; struct_dirent *de;
@ -1961,17 +1962,17 @@ print_debug_info(const int pid, int status)
strcpy(buf, "???"); strcpy(buf, "???");
if (WIFSIGNALED(status)) if (WIFSIGNALED(status))
#ifdef WCOREDUMP #ifdef WCOREDUMP
sprintf(buf, "WIFSIGNALED,%ssig=%s", xsprintf(buf, "WIFSIGNALED,%ssig=%s",
WCOREDUMP(status) ? "core," : "", WCOREDUMP(status) ? "core," : "",
signame(WTERMSIG(status))); signame(WTERMSIG(status)));
#else #else
sprintf(buf, "WIFSIGNALED,sig=%s", xsprintf(buf, "WIFSIGNALED,sig=%s",
signame(WTERMSIG(status))); signame(WTERMSIG(status)));
#endif #endif
if (WIFEXITED(status)) if (WIFEXITED(status))
sprintf(buf, "WIFEXITED,exitcode=%u", WEXITSTATUS(status)); xsprintf(buf, "WIFEXITED,exitcode=%u", WEXITSTATUS(status));
if (WIFSTOPPED(status)) if (WIFSTOPPED(status))
sprintf(buf, "WIFSTOPPED,sig=%s", signame(WSTOPSIG(status))); xsprintf(buf, "WIFSTOPPED,sig=%s", signame(WSTOPSIG(status)));
evbuf[0] = '\0'; evbuf[0] = '\0';
if (event != 0) { if (event != 0) {
static const char *const event_names[] = { static const char *const event_names[] = {
@ -1988,7 +1989,7 @@ print_debug_info(const int pid, int status)
e = event_names[event]; e = event_names[event];
else if (event == PTRACE_EVENT_STOP) else if (event == PTRACE_EVENT_STOP)
e = "STOP"; e = "STOP";
sprintf(evbuf, ",EVENT_%s (%u)", e, event); xsprintf(evbuf, ",EVENT_%s (%u)", e, event);
} }
error_msg("[wait(0x%06x) = %u] %s%s", status, pid, buf, evbuf); error_msg("[wait(0x%06x) = %u] %s%s", status, pid, buf, evbuf);
} }