Do the same for cmd_prc

Author: radare

libr/core/cmd_anal.inc.c

@@ -9625,7 +9625,7 @@ static void cmd_anal_opcode_bits(RCore *core, const char *arg, int mode) {
 				const char *color;
 				int idx;
 			} AobRow;
-			AobRow row[16] = {0};
+			AobRow row[16] = {{0}};
 			int rows = 0;
 			char *p;
 			char *s = r_strbuf_drain (sb);

libr/core/cmd_print.inc.c

@@ -953,16 +953,19 @@ static void cmd_prc(RCore *core, const ut8 *block, int len) {
 		RInterval itv = { core->addr, (ut64)len };
 		regions = r_io_bank_get_regions (core->io, core->io->bank, itv);
 	}
+	RStrBuf *sb = r_strbuf_new ("");
 	if (cols < 1 || cols > 0xfffff) {
 		cols = 32;
 	}
 	for (i = 0; i < len; i += cols) {
 		if (show_section) {
 			const char *name = r_core_get_section_name (core, core->addr + i);
-			r_cons_printf (core->cons, "%20s ", r_str_get (name));
+			r_strbuf_appendf (sb, "%20s ", r_str_get (name));
 		}
 		if (show_offset) {
-			r_print_addr (core->print, core->addr + i);
+			char addrbuf[64];
+			r_print_addr_tostring (core->print, core->addr + i, addrbuf, sizeof (addrbuf));
+			r_strbuf_append (sb, addrbuf);
 		}
 		for (j = i; j < i + cols; j++) {
 			if (j >= len) {
@@ -976,7 +979,7 @@ static void cmd_prc(RCore *core, const ut8 *block, int len) {
 					color_val);
 				color = r_cons_pal_parse (core->cons, str, NULL);
 				free (str);
-				ch = (show_cursor && core->print->cur == j)?: '_': ' ';
+				ch = (show_cursor && core->print->cur == j)? '_': ' ';
 			} else {
 				color = strdup ("");
 				if (show_cursor && core->print->cur == j) {
@@ -1001,17 +1004,19 @@ static void cmd_prc(RCore *core, const ut8 *block, int len) {
 				} else {
 					ch2 = ch;
 				}
-				r_cons_printf (core->cons, "%s%c%c", color, ch, ch2);
+				r_strbuf_appendf (sb, "%s%c%c", color, ch, ch2);
 			} else {
-				r_cons_printf (core->cons, "%s%c", color, ch);
+				r_strbuf_appendf (sb, "%s%c", color, ch);
 			}
 			free (color);
 		}
 		if (show_color) {
-			r_cons_printf (core->cons, Color_RESET);
+			r_strbuf_append (sb, Color_RESET);
 		}
-		r_cons_newline (core->cons);
+		r_strbuf_append (sb, "\n");
 	}
+	r_cons_print (core->cons, r_strbuf_get (sb));
+	r_strbuf_free (sb);
 	RVecRIORegion_free (regions);
 }
 

libr/util/print.c

@@ -397,7 +397,6 @@ R_API int r_print_addr_tostring(RPrint *p, ut64 addr, char *buf, size_t buf_size
 		p->iob.p2v (p->iob.io, addr, &addr);
 	}
 	const char *pre = Color_GREEN;
-	const char *fin = Color_RESET; // AITODO: confirm this is used only in `use_color` code paths, because maybe we can just inline the value or simplify this code a little bit more
 	if (use_color && p) {
 		RCons *cons = p->consb.cons;
 		if (cons) {
@@ -411,31 +410,32 @@ R_API int r_print_addr_tostring(RPrint *p, ut64 addr, char *buf, size_t buf_size
 			}
 		}
 	}
+	// Note: Color_RESET is only needed in use_color paths, so it's inlined directly in those format strings
 	if (use_segoff) {
 		const ut32 a = addr & 0xffff;
 		const ut32 s = (addr - a) >> ((p && p->config) ? p->config->seggrn : 4);
 		if (dec) {
 			if (use_color) {
-				return snprintf (buf, buf_size, "%s%9d:%-5d%s%c", pre, s & 0xffff, a & 0xffff, fin, ch);
+				return snprintf (buf, buf_size, "%s%9d:%-5d" Color_RESET "%c", pre, s & 0xffff, a & 0xffff, ch);
 			}
 			return snprintf (buf, buf_size, "%9d:%-5d%c", s & 0xffff, a & 0xffff, ch);
 		}
 		if (use_color) {
-			return snprintf (buf, buf_size, "%s%04x:%04x%s%c", pre, s & 0xffff, a & 0xffff, fin, ch);
+			return snprintf (buf, buf_size, "%s%04x:%04x" Color_RESET "%c", pre, s & 0xffff, a & 0xffff, ch);
 		}
 		return snprintf (buf, buf_size, "%04x:%04x%c", s & 0xffff, a & 0xffff, ch);
 	}
 	if (dec) {
 		if (use_color) {
-			return snprintf (buf, buf_size, "%s%10" PFMT64d "%s%c", pre, addr, fin, ch);
+			return snprintf (buf, buf_size, "%s%10" PFMT64d Color_RESET "%c", pre, addr, ch);
 		}
 		return snprintf (buf, buf_size, "%10" PFMT64d "%c", addr, ch);
 	}
 	if (use_color) {
 		if (p && p->wide_offsets) {
-			return snprintf (buf, buf_size, "%s0x%016" PFMT64x "%s%c", pre, addr, fin, ch);
+			return snprintf (buf, buf_size, "%s0x%016" PFMT64x Color_RESET "%c", pre, addr, ch);
 		}
-		return snprintf (buf, buf_size, "%s0x%08" PFMT64x "%s%c", pre, addr, fin, ch);
+		return snprintf (buf, buf_size, "%s0x%08" PFMT64x Color_RESET "%c", pre, addr, ch);
 	}
 	if (p && p->wide_offsets) {
 		return snprintf (buf, buf_size, "0x%016" PFMT64x "%c", addr, ch);