Fix #9525 - e graph.format=? and missing help for @@iS

This commit is contained in:
pancake 2018-02-27 23:46:47 +01:00
parent 6cdd273d5c
commit aca973f31f
2 changed files with 13 additions and 1 deletions

View File

@ -1699,6 +1699,17 @@ static int cb_scrstrconv(void *user, void *data) {
return true;
}
static int cb_graphformat(void *user, void *data) {
RConfigNode *node = (RConfigNode *) data;
RCore *core = (RCore*) user;
if (!strcmp (node->value, "?")) {
r_cons_printf ("dot\ngml\ngmlfcn\n");
return false;
}
return true;
}
static int cb_exectrap(void *user, void *data) {
RConfigNode *node = (RConfigNode *) data;
RCore *core = (RCore*) user;
@ -2715,7 +2726,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");
SETPREF ("graph.format", "dot", "Specify output format for graphs (dot, gml, gmlfcn)");
SETCB ("graph.format", "dot", &cb_graphformat, "Specify output format for graphs (dot, gml, gmlfcn)");
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)");

View File

@ -88,6 +88,7 @@ static const char *help_msg_at_at[] = {
"x", " @@t", "run 'x' on all threads (see dp)",
"x", " @@b", "run 'x' on all basic blocks of current function (see afb)",
"x", " @@i", "run 'x' on all instructions of the current function (see pdr)",
"x", " @@iS", "run 'x' on all sections adjusting blocksize",
"x", " @@f", "run 'x' on all functions (see aflq)",
"x", " @@f:write", "run 'x' on all functions matching write in the name",
"x", " @@s:from to step", "run 'x' on all offsets from, to incrementing by step",