Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-03-04 04:17:25 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix agw command (#11217)

Browse Source
This commit is contained in:
Paul I 2018-08-23 19:35:24 +03:00 committed by radare
parent f82b289822
commit b5044de59b
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
libr/core/cmd_anal.c
View File

@ -5910,27 +5910,31 @@ static char *getViewerPath() {
}
static char* graph_cmd(RCore *core, char *r2_cmd, const char *save_path) {
const char *dot = "dot";
char *cmd = NULL;
const char *ext = r_config_get (core->config, "graph.gv.format");
char *dotPath = r_file_path ("dot");
if (!r_file_exists (dotPath)) {
char *dotPath = r_file_path (dot);
if (!strcmp (dotPath, dot)) {
free (dotPath);
dotPath = r_file_path ("xdot");
}
if (r_file_exists (dotPath)) {
if (save_path && *save_path) {
cmd = r_str_newf ("%s > a.dot;!%s -T%s -o%s a.dot;", r2_cmd, dotPath, ext, save_path);
} else {
char *viewer = getViewerPath();
if (viewer) {
cmd = r_str_newf ("%s > a.dot;!%s -T%s -oa.%s a.dot;!%s a.%s", r2_cmd, dotPath, ext, ext, viewer, ext);
free (viewer);
} else {
eprintf ("Cannot find a valid picture viewer");
}
dot = "xdot";
dotPath = r_file_path (dot);
if (!strcmp (dotPath, dot)) {
free (dotPath);
return r_str_new ("agf");
}
}
if (save_path && *save_path) {
cmd = r_str_newf ("%s > a.dot;!%s -T%s -o%s a.dot;",
r2_cmd, dot, ext, save_path);
} else {
cmd = r_str_new ("agf");
char *viewer = getViewerPath();
if (viewer) {
cmd = r_str_newf ("%s > a.dot;!%s -T%s -oa.%s a.dot;!%s a.%s",
r2_cmd, dot, ext, ext, viewer, ext);
free (viewer);
} else {
eprintf ("Cannot find a valid picture viewer\n");
}
}
free (dotPath);
return cmd;
@ -6105,8 +6109,8 @@ static void cmd_agraph_print(RCore *core, const char *input) {
r_agraph_foreach (core->graph, agraph_print_node, NULL);
r_agraph_foreach_edge (core->graph, agraph_print_edge, NULL);
break;
case 'J':
case 'j':
case 'J':
case 'j':
r_cons_printf ("{\"nodes\":[");
r_agraph_print_json (core->graph);
r_cons_printf ("]}\n");
@ -6526,7 +6530,7 @@ static void cmd_anal_graph(RCore *core, const char *input) {
case 'v': // "agv" alias for "agfv"
r_core_cmdf (core, "agfv%s", input + 1);
break;
case 'w':// "agw"
case 'w':// "agw"
if (r_config_get_i (core->config, "graph.web")) {
r_core_cmd0 (core, "=H /graph/");
} else {

2
libr/util/file.c
View File

@ -247,12 +247,12 @@ R_API char *r_file_path(const char *bin) {
return file;
}
str = ptr + 1;
free (file);
}
} while (ptr);
}
free (path_env);
free (path);
free (file);
return strdup (bin);
}