From 918d2a31445d8eae14ead353bf0939ace5e703cb Mon Sep 17 00:00:00 2001
From: pancake <pancake@nopcode.org>
Date: Fri, 30 Jan 2015 00:22:48 +0100
Subject: [PATCH] Fixes for autofunction name

---
 libr/anal/fcn.c      |  2 +-
 libr/core/anal.c     | 16 ++++++++++++++--
 libr/core/cmd_flag.c |  7 ++++++-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/libr/anal/fcn.c b/libr/anal/fcn.c
index bd73e6e06c..25ec228f6b 100644
--- a/libr/anal/fcn.c
+++ b/libr/anal/fcn.c
@@ -115,7 +115,7 @@ R_API int r_anal_fcn_xref_add (RAnal *a, RAnalFunction *fcn, ut64 at, ut64 addr,
 	r_list_append (fcn->refs, ref);
 #endif
 #if FCN_SDB
-	sdb_add (DB, sdb_fmt (0, "fcn.0x%08"PFMT64x".name"), fcn->name, 0);
+	sdb_add (DB, sdb_fmt (0, "fcn.0x%08"PFMT64x".name", fcn->addr), fcn->name, 0);
 	// encode the name in base64 ?
 	sdb_num_add (DB, sdb_fmt (0, "fcn.name.%s", fcn->name), fcn->addr, 0);
 	sdb_array_add_num (DB,
diff --git a/libr/core/anal.c b/libr/core/anal.c
index 0593ff0e75..fdd53e10c2 100644
--- a/libr/core/anal.c
+++ b/libr/core/anal.c
@@ -754,6 +754,13 @@ R_API int r_core_anal_fcn(RCore *core, ut64 at, ut64 from, int reftype, int dept
 	fcn->addr = at;
 	fcn->size = 0;
 	fcn->name = r_str_newf ("fcn.%08"PFMT64x, at);
+if (0) {
+	RFlagItem *item = r_flag_get_i (core->flags, at);
+	if (item) {
+		free (fcn->name);
+		fcn->name = strdup (item->name);
+	}
+}
 	if (!(buf = malloc (ANALBS))) { //core->blocksize))) {
 		eprintf ("Error: malloc (buf)\n");
 		goto error;
@@ -802,6 +809,7 @@ R_API int r_core_anal_fcn(RCore *core, ut64 at, ut64 from, int reftype, int dept
 			}
 		}
 		//at = fcn->addr;
+#if 1
 		 {
 			RFlagItem *f = r_flag_get_i (core->flags, fcn->addr);
 			free (fcn->name);
@@ -811,21 +819,25 @@ R_API int r_core_anal_fcn(RCore *core, ut64 at, ut64 from, int reftype, int dept
 				fcn->name = r_str_newf ("fcn.%08"PFMT64x, fcn->addr);
 			}
 		 }
+#endif
 // HACK
 		//r_anal_fcn_insert (core->anal, fcn);
 		if (fcnlen == R_ANAL_RET_ERROR ||
 			(fcnlen == R_ANAL_RET_END && fcn->size < 1)) { /* Error analyzing function */
 			goto error;
 		} else if (fcnlen == R_ANAL_RET_END) { /* Function analysis complete */
-			RFlagItem *f = r_flag_get_i2 (core->flags, fcn->addr);
+			RFlagItem *f = r_flag_get_i (core->flags, fcn->addr);
 			free (fcn->name);
 			if (f) { /* Check if it's already flagged */
-				fcn->name = strdup (f->name); // memleak here?
+				fcn->name = strdup (f->name);
+			//	fcn->name = r_str_newf ("fcn.%s", f->name);
 			} else {
+#if 1
 				fcn->name = r_str_newf ("%s.%08"PFMT64x,
 						fcn->type == R_ANAL_FCN_TYPE_LOC? "loc":
 						fcn->type == R_ANAL_FCN_TYPE_SYM? "sym":
 						fcn->type == R_ANAL_FCN_TYPE_IMP? "imp": "fcn", fcn->addr);
+#endif
 				/* Add flag */
 				r_flag_space_set (core->flags, "functions");
 				r_flag_set (core->flags, fcn->name,
diff --git a/libr/core/cmd_flag.c b/libr/core/cmd_flag.c
index 7ba121a05f..7c41d155be 100644
--- a/libr/core/cmd_flag.c
+++ b/libr/core/cmd_flag.c
@@ -395,6 +395,9 @@ static int cmd_flag(void *data, const char *input) {
 				*new = 0;
 				new++;
 				item = r_flag_get (core->flags, old);
+				if (!item && !strncmp (old, "fcn.", 4)) {
+					item = r_flag_get (core->flags, old+4);
+				}
 			} else {
 				new = old;
 				item = r_flag_get_i (core->flags, core->offset);
@@ -402,7 +405,9 @@ static int cmd_flag(void *data, const char *input) {
 			if (item) {
 				if (!r_flag_rename (core->flags, item, new))
 					eprintf ("Invalid name\n");
-			} else eprintf ("Cannot find flag\n");
+			} else {
+				eprintf ("Cannot find flag (%s)\n", old);
+			}
 		}
 		break;
 	case 'n':