Refactor to use API in Visual Mode

librz/core/core.c

@@ -2446,3 +2446,31 @@ RZ_API RzCmdStatus rz_core_core_plugins_print(RzCore *core, RzCmdStateOutput *st
 	rz_cmd_state_output_array_end(state);
 	return RZ_CMD_STATUS_OK;
 }
+
+/**
+ * \brief Filters the given string based on the provided filter.
+ *
+ * \param str RZ_NONNULL The string to be filtered.
+ * \param filter The filter string to be used for filtering the str.
+ * \return RZ_OWN char* The filtered string. The caller is responsible for freeing this string.
+ */
+RZ_API RZ_OWN char *rz_core_filter_string_output(RZ_NONNULL const char *str, const char *filter) {
+	rz_return_val_if_fail(str, NULL);
+	char *filtered_str = NULL;
+	char *str_copy = rz_str_dup(str);
+	RzList *lines = rz_str_split_list(str_copy, "\n", 0);
+	RzListIter *iter;
+	char *line;
+	rz_list_foreach (lines, iter, line) {
+		if (strstr(line, filter)) {
+			if (filtered_str) {
+				filtered_str = rz_str_append(filtered_str, "\n");
+			} else {
+				filtered_str = rz_str_dup("");
+			}
+			filtered_str = rz_str_append(filtered_str, line);
+		}
+	}
+	RZ_FREE(str_copy);
+	return filtered_str;
+}

librz/core/tui/visual.c

@@ -1901,6 +1901,57 @@ static bool insert_mode_enabled(RzCore *core) {
 	return true;
 }
 
+static char *rz_get_afb_output(RZ_NONNULL RzCore *core, RZ_NONNULL RzAnalysisFunction *fcn) {
+	rz_return_val_if_fail(core && fcn, NULL);
+	RzAnalysisBlock *bb;
+	void **it;
+	RzStrBuf *buf = rz_strbuf_new("");
+	rz_pvector_foreach (fcn->bbs, it) {
+		bb = *it;
+		rz_strbuf_appendf(buf, "0x%08" PFMT64x " 0x%08" PFMT64x " 00:0000 %" PFMT64u " j 0x%08" PFMT64x " f 0x%08" PFMT64x "\n",
+			bb->addr, bb->addr + bb->size, bb->size, bb->jump, bb->fail);
+	}
+	char *result = rz_strbuf_drain(buf);
+	return result;
+}
+
+/**
+ * \brief Seeks to any basic block of the current function.
+ *
+ * \param core The RzCore instance.
+ */
+static void rz_view_and_seek_to_bb(RZ_NONNULL RzCore *core) {
+	rz_return_if_fail(core);
+	RzAnalysisFunction *fcn = rz_analysis_get_fcn_in(core->analysis, core->offset, 0);
+	if (!fcn) {
+		return;
+	}
+	char *afb_output = rz_get_afb_output(core, fcn);
+	char *output = rz_core_filter_string_output(afb_output, "");
+	RZ_FREE(afb_output);
+	if (!output) {
+		return;
+	}
+	rz_cons_println(output);
+	rz_cons_flush();
+	char *input = rz_cons_input("Seek to address: ");
+	if (RZ_STR_ISEMPTY(input)) {
+		return;
+	}
+	ut64 addr = strtoull(input, NULL, 16);
+	RZ_FREE(input);
+	RZ_FREE(output);
+	RzAnalysisBlock *bb;
+	void **iter;
+	rz_pvector_foreach (fcn->bbs, iter) {
+		bb = *iter;
+		if (bb->addr <= addr && addr < bb->addr + bb->size) {
+			rz_core_seek(core, addr, true);
+			break;
+		}
+	}
+}
+
 RZ_IPI void rz_core_visual_browse(RzCore *core, const char *input) {
 	const char *browsemsg =
 		"Browse stuff:\n"
@@ -1987,7 +2038,7 @@ RZ_IPI void rz_core_visual_browse(RzCore *core, const char *input) {
 			rz_debug_switch_to_first_thread(core->dbg);
 			break;
 		case 'b':
-			rz_core_cmd0(core, "s $(afb~...)");
+			rz_view_and_seek_to_bb(core);
 			break;
 		case 'i':
 			// XXX ii shows index first and iiq shows no offset :(

librz/include/rz_core.h

@@ -409,6 +409,8 @@ RZ_API bool rz_core_plugin_add(RzCore *core, RZ_NONNULL RzCorePlugin *plugin);
 RZ_API bool rz_core_plugin_del(RzCore *core, RZ_NONNULL RzCorePlugin *plugin);
 RZ_API bool rz_core_plugin_fini(RzCore *core);
 
+RZ_API RZ_OWN char *rz_core_filter_string_output(RZ_NONNULL const char *str, const char *filter);
+
 // #define rz_core_ncast(x) (RzCore*)(size_t)(x)
 RZ_API RZ_OWN RzList /*<char *>*/ *rz_core_theme_list(RZ_NONNULL RzCore *core);
 RZ_API char *rz_core_theme_get(RzCore *core);