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

Remove variable tracing_paths and check in pathtrace_match

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2013-03-05 16:01:53 +01:00
parent 7239dbcf2d
commit 38cfe7c923
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
defs.h
View File

@ -523,7 +523,9 @@ extern bool Tflag;
extern bool qflag; extern bool qflag;
extern bool not_failing_only; extern bool not_failing_only;
extern bool show_fd_path; extern bool show_fd_path;
extern bool tracing_paths; /* are we filtering traces based on paths? */
extern const char **paths_selected;
#define tracing_paths (paths_selected != NULL)
extern bool need_fork_exec_workarounds; extern bool need_fork_exec_workarounds;
extern unsigned xflag; extern unsigned xflag;
extern unsigned followfork; extern unsigned followfork;

13
pathtrace.c
View File

@ -37,7 +37,7 @@
#include "syscall.h" #include "syscall.h"
static const char **selected = NULL; /* paths selected for tracing */ const char **paths_selected = NULL;
static unsigned num_selected = 0; static unsigned num_selected = 0;
/* /*
@ -49,7 +49,7 @@ pathmatch(const char *path)
unsigned i; unsigned i;
for (i = 0; i < num_selected; ++i) { for (i = 0; i < num_selected; ++i) {
if (strcmp(path, selected[i]) == 0) if (strcmp(path, paths_selected[i]) == 0)
return 1; return 1;
} }
return 0; return 0;
@ -91,10 +91,10 @@ storepath(const char *path)
return; /* already in table */ return; /* already in table */
i = num_selected++; i = num_selected++;
selected = realloc(selected, num_selected * sizeof(selected[0])); paths_selected = realloc(paths_selected, num_selected * sizeof(paths_selected[0]));
if (!selected) if (!paths_selected)
die_out_of_memory(); die_out_of_memory();
selected[i] = path; paths_selected[i] = path;
} }
/* /*
@ -154,9 +154,6 @@ pathtrace_match(struct tcb *tcp)
{ {
const struct_sysent *s; const struct_sysent *s;
if (!selected)
return 1;
s = tcp->s_ent; s = tcp->s_ent;
if (!(s->sys_flags & (TRACE_FILE | TRACE_DESC))) if (!(s->sys_flags & (TRACE_FILE | TRACE_DESC)))

4
strace.c
View File

@ -123,9 +123,6 @@ bool not_failing_only = 0;
/* Show path associated with fd arguments */ /* Show path associated with fd arguments */
bool show_fd_path = 0; bool show_fd_path = 0;
/* are we filtering traces based on paths? */
bool tracing_paths = 0;
static bool detach_on_execve = 0; static bool detach_on_execve = 0;
static bool skip_startup_execve = 0; static bool skip_startup_execve = 0;
@ -1648,7 +1645,6 @@ init(int argc, char *argv[])
process_opt_p_list(optarg); process_opt_p_list(optarg);
break; break;
case 'P': case 'P':
tracing_paths = 1;
pathtrace_select(optarg); pathtrace_select(optarg);
break; break;
case 's': case 's':