Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-02-01 11:11:56 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Emit json when radiff2 is run with -Cj ##diff

Browse Source
This commit is contained in:
erfur 2022-08-07 01:20:57 +03:00 committed by GitHub
parent cc4a6115f6
commit 0133e92709
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 83 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
libr/core/gdiff.c
View File

@ -159,3 +159,79 @@ R_API void r_core_diff_show(RCore *c, RCore *c2) {
}
}
}
/* Iterate available diffs and print json output */
R_API void r_core_diff_show_json(RCore *c, RCore *c2) {
RList *fcns;
const char *match;
RListIter *iter;
RAnalFunction *f;
PJ *pj = r_core_pj_new (c);
if (!pj) {
return;
}
fcns = r_anal_get_fcns (c->anal);
if (r_list_empty (fcns)) {
R_LOG_ERROR ("No functions found, try running with -A or load a project");
return;
}
pj_a (pj);
r_list_foreach (fcns, iter, f) {
switch (f->type) {
case R_ANAL_FCN_TYPE_FCN:
case R_ANAL_FCN_TYPE_SYM:
switch (f->diff->type) {
case R_ANAL_DIFF_TYPE_MATCH:
match = "MATCH";
break;
case R_ANAL_DIFF_TYPE_UNMATCH:
match = "UNMATCH";
break;
default:
match = "NEW";
f->diff->dist = 0;
}
pj_o (pj);
pj_kn (pj, "addr", f->addr);
pj_ks (pj, "name", f->name? f->name: "");
pj_kn (pj, "size", r_anal_function_linear_size (f));
pj_kn (pj, "diff_addr", f->diff->addr);
pj_ks (pj, "diff_name", f->diff->name? f->diff->name: "");
pj_kn (pj, "diff_size", f->diff->size);
pj_ks (pj, "match", match);
pj_kd (pj, "dist", f->diff->dist);
pj_end (pj);
break;
}
}
fcns = r_anal_get_fcns (c2->anal);
r_list_foreach (fcns, iter, f) {
switch (f->type) {
case R_ANAL_FCN_TYPE_FCN:
case R_ANAL_FCN_TYPE_SYM:
if (f->diff->type == R_ANAL_DIFF_TYPE_NULL) {
pj_o (pj);
pj_kn (pj, "addr", f->addr);
pj_ks (pj, "name", f->name? f->name: "");
pj_kn (pj, "size", r_anal_function_linear_size (f));
pj_ks (pj, "match", "NEW");
pj_kd (pj, "dist", 0);
pj_end (pj);
}
break;
}
}
pj_end (pj);
char *s = pj_drain (pj);
printf ("%s\n", s);
free (s);
}

1
libr/include/r_core.h
View File

@ -842,6 +842,7 @@ R_API void r_core_hack_help(const RCore *core);
R_API int r_core_hack(RCore *core, const char *op);
R_API bool r_core_dump(RCore *core, const char *file, ut64 addr, ut64 size, int append);
R_API void r_core_diff_show(RCore *core, RCore *core2);
R_API void r_core_diff_show_json(RCore *core, RCore *core2);
R_API void r_core_clippy(RCore *core, const char *msg);
/* watchers */

8
libr/main/radiff2.c
View File

@ -1054,7 +1054,7 @@ R_API int r_main_radiff2(int argc, const char **argv) {
break;
case 't':
ro.threshold = atoi (opt.arg);
printf ("%s\n", opt.arg);
// printf ("%s\n", opt.arg);
break;
case 'd':
delta = 1;
@ -1211,7 +1211,11 @@ R_API int r_main_radiff2(int argc, const char **argv) {
r_core_zdiff (c, c2);
} else {
r_core_gdiff (c, c2);
r_core_diff_show (c, c2);
if (ro.diffmode == 'j') {
r_core_diff_show_json (c, c2);
} else {
r_core_diff_show (c, c2);
}
}
} else if (ro.mode == MODE_DIFF_SYMBOLS) {
int sz;