Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-01-20 20:55:32 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Add bin.strings and fix other bin.* load issues

Browse Source
This commit is contained in:
pancake 2012-12-13 10:21:57 +01:00
parent 03ef6071c7
commit 59f70255cf
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libr/core/bin.c
View File

@ -11,9 +11,12 @@ static int bin_strings (RCore *r, int mode, ut64 baddr, int va) {
char str[R_FLAG_NAME_SIZE];
/* bin str limits */
int hasstr= r_config_get_i (r->config, "bin.strings");
int rawstr = r_config_get_i (r->config, "bin.rawstr");
int minstr = r_config_get_i (r->config, "bin.minstr");
if (!rawstr || (rawstr && !r->bin->cur.curplugin))
if (!hasstr) return 0;
if (!r->bin->cur.curplugin) return 0;
if (!rawstr && !r->bin->cur.curplugin->info)
return 0;
if (minstr>0) {
r->bin->minstrlen = minstr;
@ -21,10 +24,9 @@ static int bin_strings (RCore *r, int mode, ut64 baddr, int va) {
r_config_set_i (r->config, "bin.minstr",
r->bin->minstrlen);
}
if (minstr==0) return -1;
if (r->bin->minstrlen==0) return -1;
/* code */
if ((list = r_bin_get_strings (r->bin)) == NULL)
return R_FALSE;
@ -33,7 +35,7 @@ static int bin_strings (RCore *r, int mode, ut64 baddr, int va) {
r_list_foreach (list, iter, string) {
char *p, *str = strdup (string->string);
//r_name_filter (str, 128);
for(p=str;*p;p++) if(*p=='"')*p='\'';
for (p=str;*p;p++) if(*p=='"')*p='\'';
r_cons_printf ("%s{\"offset\":%"PFMT64d",\"length\":%d,\"string\":\"%s\"}",
iter->p?",":"", va? string->rva:string->offset,
string->size, str);

2
libr/core/config.c
View File

@ -536,6 +536,8 @@ R_API int r_core_config_init(RCore *core) {
r_config_set_cb (cfg, "asm.profile", "default", &config_asmprofile_callback);
r_config_desc (cfg, "asm.profile", "configure disassembler (default, simple, gas, smart, debug, full)");
/* bin */
r_config_set (cfg, "bin.strings", "true");
r_config_desc (cfg, "bin.strings", "Load strings or not\n");
r_config_set_i (cfg, "bin.minstr", 0);
r_config_desc (cfg, "bin.minstr", "Minimum string length for r_bin");
r_config_set (cfg, "bin.rawstr", "false");