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

Fix pointer display in 'pf'

Browse Source
This commit is contained in:
Skia 2014-07-27 20:04:27 +02:00 committed by Anton Kochkov
parent 676ad9c545
commit 6350fe766e
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libr/util/p_format.c
View File

@ -154,6 +154,26 @@ R_API int r_print_format(RPrint *p, ut64 seek, const ut8* b, int len, const char
| (ut64)(*(buf+i+5))<<40 | (ut64)(*(buf+i+4))<<32
| (*(buf+i+3))<<24 | (*(buf+i+2))<<16 | *(buf+i+1)<<8 | *(buf+i);
tmp = *arg;
if (otimes>1)
p->printf (" ");
#define MUSTSET (setval && elem == idx)
#define MUSTSEE (elem == -1 || elem == idx)
if (MUSTSEE) {
if (!(MUSTSET)) {
if (oldprintf)
p->printf = oldprintf;
if (idx<nargs && tmp != 'e')
if (tmp == '*')
idx--;
else
p->printf (namefmt, r_str_word_get0 (args, idx));
}
} else {
if (!oldprintf)
oldprintf = p->printf;
p->printf = nullprintf;
}
feed_me_again:
switch (isptr) {
case 1:
@ -177,7 +197,6 @@ R_API int r_print_format(RPrint *p, ut64 seek, const ut8* b, int len, const char
memcpy (buf, b, len);
isptr = 0;
arg--;
idx--;
continue;
}
if (tmp == 0 && last != '*')
@ -190,7 +209,7 @@ R_API int r_print_format(RPrint *p, ut64 seek, const ut8* b, int len, const char
arg++;
tmp = *arg; //last;
// arg--;
// idx--;
idx--;
goto feed_me_again;
case '+':
idx--;
@ -218,22 +237,7 @@ R_API int r_print_format(RPrint *p, ut64 seek, const ut8* b, int len, const char
i = len; // exit
continue;
}
if (otimes>1)
p->printf (" ");
#define MUSTSET (setval && elem == idx)
#define MUSTSEE (elem == -1 || elem == idx)
if (MUSTSEE) {
if (!(MUSTSET)) {
if (oldprintf)
p->printf = oldprintf;
if (idx<nargs)
p->printf (namefmt, r_str_word_get0 (args, idx));
}
} else {
if (!oldprintf)
oldprintf = p->printf;
p->printf = nullprintf;
}
/* cmt chars */
switch (tmp) {
#if 0