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

C[Chsdmf][*] without arguments now lists respective meta info (#8464)

Browse Source 
* C[Chsdmf][*] without arguments now lists respective meta info

* Fix off-by-one
This commit is contained in:
Khairul Azhar Kasmiran 2017-09-12 18:14:09 +08:00 committed by radare
parent a733612d40
commit 04844f00c6
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libr/anal/meta.c
View File

@ -540,10 +540,12 @@ R_API int r_meta_list_cb(RAnal *a, int type, int rad, SdbForeachCallback cb, voi
}
isFirst = true; // TODO: kill global
ls_foreach (ls, lsi, kv) {
if (cb) {
cb ((void *)&ui, kv->key, kv->value);
} else {
meta_print_item ((void *)&ui, kv->key, kv->value);
if (type == R_META_TYPE_ANY || (strlen (kv->key) > 5 && kv->key[5] == type)) {
if (cb) {
cb ((void *)&ui, kv->key, kv->value);
} else {
meta_print_item ((void *)&ui, kv->key, kv->value);
}
}
}
ls_free (ls);

7
libr/core/cmd_meta.c
View File

@ -10,7 +10,10 @@
static const char *help_msg_C[] = {
"Usage:", "C[-LCvsdfm*?][*?] [...]", " # Metadata management",
"C", "", "list meta info in human friendly form",
"C*", "", "list meta info in r2 commands",
"C[Chsdmf]", "", "list comments/hidden/strings/data/magic/formatted in human friendly form",
"C[Chsdmf]*", "", "list comments/hidden/strings/data/magic/formatted in r2 commands",
"C-", " [len] [[@]addr]", "delete metadata at given address range",
"CL", "[-][*] [file:line] [addr]", "show or add 'code line' information (bininfo)",
"CS", "[-][space]", "manage meta-spaces to filter comments, etc..",
@ -555,7 +558,7 @@ static int cmd_meta_hsdmf(RCore *core, const char *input) {
break;
case ' ':
case '\0':
if (type != 'z' && input[1] == '*') {
if (type != 'z' && !input[1] && !core->tmpseek) {
r_meta_list (core->anal, type, 0);
break;
}
@ -821,6 +824,7 @@ static int cmd_meta(void *data, const char *input) {
case 'v': // Cr
r_comment_vars (core, input + 1);
break;
case '\0':
case 'j':
case '*':
r_meta_list (core->anal, R_META_TYPE_ANY, *input);
@ -846,7 +850,6 @@ static int cmd_meta(void *data, const char *input) {
r_meta_del (core->anal, R_META_TYPE_ANY, core->offset, i, "");
} else r_meta_cleanup (core->anal, 0LL, UT64_MAX);
break;
case '\0':
case '?':
r_core_cmd_help (core, help_msg_C);
break;