Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-01-26 07:44:29 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix #3695 - Proper /R disasm colors

Browse Source
This commit is contained in:
pancake 2015-11-19 12:11:36 +01:00
parent 92991394a5
commit 4b7328f942
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libr/core/cmd_search.c
View File

@ -754,7 +754,7 @@ static void print_rop (RCore *core, RList *hitlist, char mode, int *json_first)
const char *otype;
RCoreAsmHit *hit = NULL;
RListIter *iter;
char *buf_asm, *buf_hex;
char *buf_asm;
unsigned int size = 0;
RAnalOp analop = {0};
RAsmOp asmop;
@ -825,25 +825,22 @@ static void print_rop (RCore *core, RList *hitlist, char mode, int *json_first)
if (colorize) {
buf_asm = r_print_colorize_opcode (asmop.buf_asm,
core->cons->pal.reg, core->cons->pal.num);
buf_hex = r_print_colorize_opcode (asmop.buf_hex,
core->cons->pal.reg, core->cons->pal.num);
otype = r_print_color_op_type (core->print, analop.type);
if (comment) {
r_cons_printf (" 0x%08"PFMT64x" %s%18s %s%s ; %s\n",
hit->addr, otype, buf_hex, buf_asm, Color_RESET, comment);
r_cons_printf (" 0x%08"PFMT64x" %18s%s %s%s ; %s\n",
hit->addr, asmop.buf_hex, otype, buf_asm, Color_RESET, comment);
} else {
r_cons_printf (" 0x%08"PFMT64x" %s%18s %s%s\n",
hit->addr, otype, buf_hex, buf_asm, Color_RESET);
r_cons_printf (" 0x%08"PFMT64x" %18s%s %s%s\n",
hit->addr, asmop.buf_hex, otype, buf_asm, Color_RESET);
}
free (buf_asm);
free (buf_hex);
} else {
if (comment) {
r_cons_printf (" 0x%08"PFMT64x" %18s %s ; %s\n",
hit->addr, asmop.buf_hex, asmop.buf_asm, comment);
} else {
r_cons_printf (" 0x%08"PFMT64x" %18s %s\n",
hit->addr, asmop.buf_hex, asmop.buf_asm);
r_cons_printf (" 0x%08"PFMT64x" %18s %s\n",
hit->addr, asmop.buf_hex, asmop.buf_asm);
}
}
free (buf);

2
libr/core/io.c
View File

@ -1,4 +1,4 @@
/* radare2 - LGPL - Copyright 2009-2014 - pancake */
/* radare2 - LGPL - Copyright 2009-2015 - pancake */
#include "r_core.h"