From 59f70255cf93d1d1c67987fdb7a5f93d3ff9e595 Mon Sep 17 00:00:00 2001
From: pancake <pancake@nopcode.org>
Date: Thu, 13 Dec 2012 10:21:57 +0100
Subject: [PATCH] Add bin.strings and fix other bin.* load issues

---
 libr/core/bin.c    | 10 ++++++----
 libr/core/config.c |  2 ++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/libr/core/bin.c b/libr/core/bin.c
index ca1949a402..8aa5a46a57 100644
--- a/libr/core/bin.c
+++ b/libr/core/bin.c
@@ -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);
diff --git a/libr/core/config.c b/libr/core/config.c
index eac02f8e0f..0a47763d80 100644
--- a/libr/core/config.c
+++ b/libr/core/config.c
@@ -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");