Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

$: Refactor out code for $* and $** #4368

Merged
merged 2 commits into from
Mar 17, 2024
Merged

$: Refactor out code for $* and $** #4368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d27e0f
Base test output
kazarmy Mar 17, 2024
cdd3bd3
$: Refactor out code for $* and $**
kazarmy Mar 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions librz/core/cmd/cmd_alias.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include "rz_cmd.h"
#include "rz_core.h"

// TODO: Refactor out code for $* and $**
static int rz_cmd_alias(void *data, const char *input) {
RzCore *core = (RzCore *)data;
int i = strlen(input);
Expand Down Expand Up @@ -94,20 +93,6 @@ static int rz_cmd_alias(void *data, const char *input) {
} else {
RZ_LOG_ERROR("core: unknown key '%s'\n", buf);
}
} else if (buf[1] == '*') {
/* Show aliases */
int i, count = 0;
char **keys = rz_cmd_alias_keys(core->rcmd, &count);
for (i = 0; i < count; i++) {
char *v = rz_cmd_alias_get(core->rcmd, keys[i], 0);
char *q = rz_base64_encode_dyn((const ut8 *)v, strlen(v));
if (buf[2] == '*') {
rz_cons_printf("%s=%s\n", keys[i], v);
} else {
rz_cons_printf("%s=base64:%s\n", keys[i], q);
}
free(q);
}
} else if (!buf[1]) {
int i, count = 0;
char **keys = rz_cmd_alias_keys(core->rcmd, &count);
Expand Down Expand Up @@ -149,12 +134,27 @@ RZ_IPI RzCmdStatus rz_alias_handler(RzCore *core, int argc, const char **argv) {
return RZ_CMD_STATUS_OK;
}

static void list_aliases(RzCore *core, bool base64) {
int i, count = 0;
char **keys = rz_cmd_alias_keys(core->rcmd, &count);
for (i = 0; i < count; i++) {
char *v = rz_cmd_alias_get(core->rcmd, keys[i], 0);
if (base64) {
char *q = rz_base64_encode_dyn((const ut8 *)v, strlen(v));
rz_cons_printf("%s=base64:%s\n", keys[i], q);
free(q);
} else {
rz_cons_printf("%s=%s\n", keys[i], v);
}
}
}

RZ_IPI RzCmdStatus rz_alias_list_cmd_base64_handler(RzCore *core, int argc, const char **argv) {
rz_cmd_alias(core, "*");
list_aliases(core, true);
return RZ_CMD_STATUS_OK;
}

RZ_IPI RzCmdStatus rz_alias_list_cmd_plain_handler(RzCore *core, int argc, const char **argv) {
rz_cmd_alias(core, "**");
list_aliases(core, false);
return RZ_CMD_STATUS_OK;
}
13 changes: 13 additions & 0 deletions test/db/cmd/cmd_alias
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,16 @@ rax = 0x0000000000000000
rax = 0x0000000000000000
EOF
RUN

NAME=$* and $**
FILE=--
CMDS=<<EOF
$dis=pdf
$*
$**
EOF
EXPECT=<<EOF
$dis=base64:cGRm
$dis=pdf
EOF
RUN
Loading