Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-12-02 10:16:21 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix #8469 - Fix cmd.repeat again and honor opdelta for pd

Browse Source
This commit is contained in:
pancake 2017-09-18 16:18:12 +02:00
parent 215098da55
commit 1a1958f0e5
3 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libr/core/cmd.c
View File

@ -878,9 +878,12 @@ static int cmd_kuery(void *data, const char *input) {
if (!s) s = core->sdb;
for (;;) {
r_line_set_prompt (p);
if (r_cons_fgets (buf, buflen, 0, NULL) < 1)
if (r_cons_fgets (buf, buflen, 0, NULL) < 1) {
break;
if (!*buf) break;
}
if (!*buf) {
break;
}
out = sdb_querys (s, NULL, 0, buf);
if (out) {
r_cons_println (out);
@ -1478,6 +1481,10 @@ static int r_core_cmd_subst(RCore *core, char *cmd) {
const char *cmdrep = NULL;
cmd = r_str_trim_head_tail (icmd);
// lines starting with # are ignored (never reach cmd_hash()), except #! and #?
if (!*cmd) {
r_core_cmd_repeat (core, true);
return r_core_cmd_nullcallback (core);
}
if (!icmd || (cmd[0] == '#' && cmd[1] != '!' && cmd[1] != '?')) {
goto beach;
}
@ -1998,12 +2005,12 @@ next2:
/* sub commands */
ptr = strchr (cmd, '`');
if (ptr) {
int empty = 0;
bool empty = false;
int oneline = 1;
if (ptr[1] == '`') {
memmove (ptr, ptr + 1, strlen (ptr));
oneline = 0;
empty = 1;
empty = true;
}
ptr2 = strchr (ptr + 1, '`');
if (empty) {
@ -3249,7 +3256,7 @@ R_API char *r_core_cmd_str(RCore *core, const char *cmd) {
R_API void r_core_cmd_repeat(RCore *core, int next) {
// Fix for backtickbug px`~`
if (!core->lastcmd || core->cmd_depth + 1 < R_CORE_CMD_DEPTH) {
if (!core->lastcmd || core->cmd_depth < 1) {
return;
}
switch (*core->lastcmd) {
@ -3269,13 +3276,21 @@ R_API void r_core_cmd_repeat(RCore *core, int next) {
case 'p': // print
case 'x':
case '$':
if (next) {
r_core_seek (core, core->offset + core->blocksize, 1);
} else {
if (core->blocksize > core->offset) {
r_core_seek (core, 0, 1);
if (!strncmp (core->lastcmd, "pd", 2)) {
if (core->lastcmd[2]== ' ') {
r_core_cmdf (core, "so %s", core->lastcmd + 3);
} else {
r_core_seek (core, core->offset - core->blocksize, 1);
r_core_cmd0 (core, "so `pi~?`");
}
} else {
if (next) {
r_core_seek (core, core->offset + core->blocksize, 1);
} else {
if (core->blocksize > core->offset) {
r_core_seek (core, 0, 1);
} else {
r_core_seek (core, core->offset - core->blocksize, 1);
}
}
}
r_core_cmd0 (core, core->lastcmd);

3
libr/core/cmd_api.c
View File

@ -201,8 +201,9 @@ R_API int r_cmd_call(RCmd *cmd, const char *input) {
RListIter *iter;
RCorePlugin *cp;
if (!input || !*input) {
if (cmd->nullcallback != NULL)
if (cmd->nullcallback) {
ret = cmd->nullcallback (cmd->data);
}
} else {
char *nstr = NULL;
const char *ji = r_cmd_alias_get (cmd, input, 1);

2
libr/util/rbtree.c
View File

@ -190,7 +190,7 @@ R_API void r_rbtree_aug_insert(RBNode **root, void *data, RBNode *node, RBCompar
q->red = true;
}
}
if (q->red && && p && p->red) {
if (q->red && p && p->red) {
int d3 = t ? t->child[0] != g : -1, d2 = g->child[0] != p;
if (p->child[d2] == q) {
g = zag (g, d2, sum);