Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-12-13 16:18:33 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix #5725 - Honor hex.cols in pxe

Browse Source
This commit is contained in:
pancake 2016-09-15 19:31:25 +02:00
parent 515c732bef
commit 73b73d507c
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libr/core/cmd_print.c
View File

@ -3556,7 +3556,7 @@ static int cmd_print(void *data, const char *input) {
core->print->flags &= (((ut32)-1) & (~R_PRINT_FLAGS_SPARSE));
}
break;
case 'e':
case 'e': // "pxe"
if (l != 0) {
int j;
char emoji[] = {'\x8c','\x80','\x8c','\x82','\x8c','\x85','\x8c','\x88',
@ -3623,26 +3623,32 @@ static int cmd_print(void *data, const char *input) {
'\x91','\xba','\x91','\xbb','\x91','\xbc','\x91','\xbd',
'\x91','\xbe','\x91','\xbf','\x92','\x80','\x92','\x81',
'\x92','\x82','\x92','\x83','\x92','\x84','\x92','\x85'};
for (i=0; i<len; i+=16) {
int cols = core->print->cols;
if (cols < 1) {
cols = 1;
}
for (i = 0; i < len; i += cols) {
r_print_addr (core->print, core->offset+i);
for (j=i; j<i+16; j+=1) {
ut8 *p = (ut8*)core->block+j;
if (j<len)
for (j = i; j < i + cols; j += 1) {
ut8 *p = (ut8*)core->block + j;
if (j<len) {
r_cons_printf ("\xf0\x9f%c%c ", emoji[*p*2], emoji[*p*2+1]);
else
r_cons_printf (" ");
} else {
r_cons_print (" ");
}
}
r_cons_printf (" ");
for (j=i; j<len && j<i+16; j+=1) {
ut8 *p = (ut8*)core->block+j;
r_cons_print (" ");
for (j = i; j < len && j < i + cols; j += 1) {
ut8 *p = (ut8*)core->block + j;
r_print_byte (core->print, "%c", j, *p);
}
r_cons_printf ("\n");
r_cons_newline ();
}
}
break;
case 'l':
len = core->print->cols*len;
/* faltrhou */
default:
if (l != 0) {
int restore_block_size = 0;