Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add "save to file" to ag*w commands + colorize comments like ";arg1" #10860

Merged
merged 8 commits into from Aug 4, 2018
Merged

Add "save to file" to ag*w commands + colorize comments like ";arg1" #10860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d1ec2dc
Colorize comments like ';arg1' as var type comments
cyanpencil Jul 28, 2018
44d3770
Choose path for saving dot graph
cyanpencil Jul 28, 2018
ab2e3d6
Fixed ag? help
cyanpencil Jul 30, 2018
be22d20
Remove addr argument from most of ag* commands
cyanpencil Jul 30, 2018
b37fd7a
Fix: gcc warnings in r_core_graph_cmd + use vartype comments in cmd_type
cyanpencil Jul 31, 2018
280184c
Refactor: rename r_core_graph_cmd to graph_cmd
cyanpencil Jul 31, 2018
106ae2e
Refactor: many small refactors of ag* commands in cmd_anal.c
cyanpencil Aug 1, 2018
5ac4f6b
Fix: wrong merge in cconfig.c and updated ag? help
cyanpencil Aug 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion libr/anal/var.c
View file
Open in desktop
Expand Up @@ -703,7 +703,7 @@ R_API void extract_rarg(RAnal *anal, RAnalOp *op, RAnalFunction *fcn, int *reg_s
r_anal_var_link (anal, op->addr, op->var);
}
r_anal_var_access (anal, fcn->addr, 'r', 1, delta, 0, op->addr);
r_meta_set_string (anal, R_META_TYPE_COMMENT, op->addr, vname);
r_meta_set_string (anal, R_META_TYPE_VARTYPE, op->addr, vname);
free (vname);
}
if (op->dst && opdreg && !strcmp (opdreg, regname)) {
Expand Down
54 changes: 1 addition & 53 deletions libr/core/cconfig.c
View file
Open in desktop
Expand Up @@ -2271,58 +2271,6 @@ static int cb_dbgsnap(void *user, void *data) {
return true;
}

static char *getViewerPath() {
int i;
const char *viewers[] = {
#if __WINDOWS__
"explorer",
#else
"open",
"geeqie",
"gqview",
"eog",
"xdg-open",
#endif
NULL
};
for (i = 0; viewers[i]; i++) {
char *viewerPath = r_file_path (viewers[i]);
if (viewerPath && strcmp (viewerPath, viewers[i])) {
return viewerPath;
}
free (viewerPath);
}
return NULL;
}

R_API char* r_core_graph_cmd(RCore *core, char *r2_cmd) {
char *cmd = NULL;
char *xdotPath = r_file_path ("xdot");
const char *ext = r_config_get (core->config, "graph.extension");
if (r_file_exists (xdotPath)) {
cmd = r_str_newf ("%s > a.dot;!xdot a.dot", r2_cmd);
} else {
char *dotPath = r_file_path ("dot");
if (r_file_exists (dotPath)) {
R_FREE (dotPath);
char *viewer = getViewerPath();
if (viewer) {
cmd = r_str_newf ("%s > a.dot;!dot -T%s -oa.%s a.dot;!%s a.%s", r2_cmd, ext, ext, viewer, ext);
free (viewer);
} else {
eprintf ("Cannot find a valid picture viewer");
}
} else {
cmd = r_str_new ("agf");
}
free (dotPath);
}
free (xdotPath);
return cmd;
}



#define SLURP_LIMIT (10*1024*1024)
R_API int r_core_config_init(RCore *core) {
int i;
Expand Down Expand Up @@ -2840,7 +2788,7 @@ R_API int r_core_config_init(RCore *core) {
/* graph */
SETPREF ("graph.comments", "true", "Show disasm comments in graph");
SETPREF ("graph.cmtright", "false", "Show comments at right");
SETCB ("graph.extension", "gif", &cb_graphformat, "Graph extension when using 'w' format (png, jpg, pdf, ps, svg, json)");
SETCB ("graph.gv.format", "gif", &cb_graphformat, "Graph image extension when using 'w' format (png, jpg, pdf, ps, svg, json)");
SETPREF ("graph.refs", "false", "Graph references in callgraphs (.agc*;aggi)");
SETI ("graph.edges", 2, "0=no edges, 1=simple edges, 2=avoid collisions");
SETI ("graph.layout", 0, "Graph layout (0=vertical, 1=horizontal)");
Expand Down