Skip to content

Commit

Permalink
Handle invalid subcommands under om ##help
Browse files Browse the repository at this point in the history
  • Loading branch information
@trufae
trufae authored Dec 22, 2024
1 parent bb40b09 commit 31864f3
Show file tree
Hide file tree
Showing 2 changed files with 158 additions and 119 deletions.
263 changes: 155 additions & 108 deletions libr/core/cmd_open.inc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ static RCoreHelpMessage help_msg_om = {
"omt", " mapid", "toggle map backwards tying (same as omtb)",
"omtb", " mapid", "toggle map backwards tying",
"omtf", " mapid", "toggle map forwards tying",
"omu", " fd va sz pa rwx name", "same as `om` but checks for existance (u stands for uniq)",
NULL
};

Expand Down Expand Up @@ -817,75 +818,31 @@ static void cmd_omd(RCore *core, const char* input) {
}

static void cmd_open_banks(RCore *core, int argc, char *argv[]) {
if (argc == 1) {
switch (argv[0][1]) {
case '=': // "omb=[name]"
{
RIOBank *bank = r_io_bank_get_byname (core->io, argv[0] + 2);
if (bank) {
r_io_bank_use (core->io, bank->id);
} else {
R_LOG_ERROR ("unknown bank name (%s)", argv[0] + 2);
}
switch (argv[0][1]) {
case '=': // "omb=[name]"
if (argc == 1) {
RIOBank *bank = r_io_bank_get_byname (core->io, argv[0] + 2);
if (bank) {
r_io_bank_use (core->io, bank->id);
} else {
R_LOG_ERROR ("unknown bank name (%s)", argv[0] + 2);
}
break;
case 'g': // "ombg"
{
ut32 mapid;
r_id_storage_get_lowest (&core->io->maps, &mapid);
do {
RIOMap *map = r_id_storage_get (&core->io->maps, mapid);
r_io_bank_map_add_top (core->io, core->io->bank, map->id);
} while (r_id_storage_get_next (&core->io->maps, &mapid));
} else {
RIOBank *bank = r_io_bank_get_byname (core->io, argv[1]);
if (bank) {
r_io_bank_use (core->io, bank->id);
} else {
R_LOG_ERROR ("unknown bank name (%s)", argv[1]);
}
break;
case 'q': // "ombq"
}
break;
case 'q': // "ombq"
if (argc != 1) {
R_LOG_ERROR ("ombq takes no arguments");
} else {
r_cons_printf ("%d\n", core->io->bank);
break;
case 0: // "omb"
{
ut32 bank_id = 0;
if (!r_id_storage_get_lowest (&core->io->banks, &bank_id)) {
break;
}
do {
RIOBank *bank = r_id_storage_get (&core->io->banks, bank_id);
const char ch = core->io->bank == bank_id? '*': '-';
r_cons_printf ("%c %d %s [", ch, bank->id, bank->name);
RIOMapRef *mapref;
RListIter *iter;
r_list_foreach (bank->maprefs, iter, mapref) {
r_cons_printf (" %d", mapref->id);
}
r_cons_printf (" ]\n");
// list all the associated maps
} while (r_id_storage_get_next (&core->io->banks, &bank_id));
}
break;
case '+': // "omb+ [name]"
{
const char *name = argv[0] + 2;
if (isdigit (*name)) {
// add a map to the current bank
// we cant name a bank with a number :?
r_io_bank_map_add_top (core->io, core->io->bank, atoi (name));
} else {
// add a new bank
RIOBank *bank = r_io_bank_new (name);
if (bank) {
r_io_bank_add (core->io, bank);
}
}
}
break;
case '?': // "omb?"
default:
r_core_cmd_help (core, help_msg_omb);
break;
}
return;
}
switch (argv[0][1]) {
break;
case 'a': // "omba"
if (isdigit (argv[1][0])) {
int mapid = atoi (argv[1]);
Expand All @@ -910,32 +867,91 @@ static void cmd_open_banks(RCore *core, int argc, char *argv[]) {
}
break;
case '-': // "omb-"
if (!strcmp ("*", argv[1])) {
r_io_bank_drain (core->io, core->io->bank);
core->io->bank = r_io_bank_first (core->io);
{
const char *arg = (argc == 1)? argv[0] + 2: argv[1];
if (R_STR_ISEMPTY (arg)) {
R_LOG_ERROR ("Missing argument for omb-");
} else if (!strcmp ("*", arg)) {
r_io_bank_drain (core->io, core->io->bank);
core->io->bank = r_io_bank_first (core->io);
} else {
int bank_id = r_num_math (core->num, arg);
if (core->num->nc.errors != 0) {
r_io_bank_del (core->io, bank_id);
} else {
R_LOG_ERROR ("Invalid number in %s", arg);
}
}
}
break;
case 'g': // "ombg"
if (argc == 1) {
ut32 mapid;
r_id_storage_get_lowest (&core->io->maps, &mapid);
do {
RIOMap *map = r_id_storage_get (&core->io->maps, mapid);
r_io_bank_map_add_top (core->io, core->io->bank, map->id);
} while (r_id_storage_get_next (&core->io->maps, &mapid));
} else {
int bank_id = atoi (argv[1]);
r_io_bank_del (core->io, bank_id);
R_LOG_ERROR ("ombg takes no arguments");
}
break;
case '+': // "omb+ [name]"
{
if (argc == 1) {
const char *name = argv[0] + 2;
if (isdigit (*name)) {
// add a map to the current bank
// we cant name a bank with a number :?
r_io_bank_map_add_top (core->io, core->io->bank, atoi (name));
} else {
// add a new bank
RIOBank *bank = r_io_bank_new (name);
if (bank) {
r_io_bank_add (core->io, bank);
} else {
R_LOG_ERROR ("Cannot create map from %s", name);
}
}
} else {
RIOBank *bank = r_io_bank_new (argv[1]);
r_io_bank_add (core->io, bank);
if (bank) {
r_io_bank_add (core->io, bank);
} else {
R_LOG_ERROR ("Cannot create map from %s", argv[1]);
}
}
break;
case 0: // "omb [id]"
{
if (argc == 1) {
ut32 bank_id = 0;
if (!r_id_storage_get_lowest (&core->io->banks, &bank_id)) {
break;
}
do {
RIOBank *bank = r_id_storage_get (&core->io->banks, bank_id);
const char ch = core->io->bank == bank_id? '*': '-';
r_cons_printf ("%c %d %s [", ch, bank->id, bank->name);
RIOMapRef *mapref;
RListIter *iter;
r_list_foreach (bank->maprefs, iter, mapref) {
r_cons_printf (" %d", mapref->id);
}
r_cons_printf (" ]\n");
// list all the associated maps
} while (r_id_storage_get_next (&core->io->banks, &bank_id));
} else {
int id = r_num_get (NULL, argv[1]);
if (!r_io_bank_use (core->io, id)) {
R_LOG_ERROR ("Cannot find bank by id %s", argv[1]);
}
}
break;
case '?': // "omb?"
default:
r_core_cmd_help (core, help_msg_omb);
break;
default:
r_core_return_invalid_command (core, "omb", argv[0][1]);
break;
}
}

Expand All @@ -952,7 +968,7 @@ static void cmd_open_map(RCore *core, const char *input) {
ut64 fd = 0LL;
ut32 id = 0;
ut64 addr = 0;
char *s = NULL, *p = NULL, *q = NULL;
char *s = NULL, *p = NULL;
ut64 newaddr;
RIOMap *map = NULL;
const char *P;
Expand Down Expand Up @@ -1084,6 +1100,9 @@ static void cmd_open_map(RCore *core, const char *input) {
R_LOG_ERROR ("Cannot find any map with mapid %d", id);
}
break;
default:
r_core_return_invalid_command (core, "omp", input[2]);
break;
}
break;
case 't': // "omt"
Expand All @@ -1108,27 +1127,29 @@ static void cmd_open_map(RCore *core, const char *input) {
case 0:
r_cons_printf ("%s\n", map->name);
break;
default:
case ' ':
r_io_map_set_name (map, r_str_trim_head_ro (input + 3));
break;
default:
r_core_return_invalid_command (core, "omn.", input[3]);
break;
}
}
} else {
} else if (input[2] == 0 || input[2] == ' ' || input[2] == 'i') {
bool use_id = (input[2] == 'i') ? true : false;
s = r_str_trim_dup (input + (use_id ? 3: 2));
if (!s) {
break;
}
p = s;

while (*s == ' ') {
s++;
}
s = (char *)r_str_trim_head_ro (s);
if (*s == '\0') {
s = p;
break;
}
if (!(q = strchr (s, ' '))) {
char *q = strchr (s, ' ');
if (q) {
*q++ = '\0';
if (use_id) {
id = (ut32)r_num_math (core->num, s);
map = r_io_map_get (core->io, id);
Expand All @@ -1137,30 +1158,31 @@ static void cmd_open_map(RCore *core, const char *input) {
map = r_io_map_get_at (core->io, addr);
}
if (map) {
r_io_map_del_name (map);
} else {
R_LOG_ERROR ("Cannot find map with given id or address");
if (*q) {
r_io_map_set_name (map, q);
} else {
r_io_map_del_name (map);
}
}
s = p;
break;
}
*q = '\0';
q++;
if (use_id) {
id = (ut32)r_num_math (core->num, s);
map = r_io_map_get (core->io, id);
} else {
addr = r_num_math (core->num, s);
map = r_io_map_get_at (core->io, addr);
}
if (map) {
if (*q) {
r_io_map_set_name (map, q);
if (use_id) {
id = (ut32)r_num_math (core->num, s);
map = r_io_map_get (core->io, id);
} else {
addr = r_num_math (core->num, s);
map = r_io_map_get_at (core->io, addr);
}
if (map) {
r_io_map_del_name (map);
} else {
R_LOG_ERROR ("Cannot find map with given id or address");
}
s = p;
break;
}
s = p;
} else {
r_core_return_invalid_command (core, "omn", input[2]);
}
break;
case 'a': // "oma"
Expand All @@ -1180,7 +1202,7 @@ static void cmd_open_map(RCore *core, const char *input) {
case 'm': // "omm"
if (input[2] == '?') {
r_core_cmd_help_contains (core, help_msg_om, "omm");
} else {
} else if (input[2] == 0 || input[2] == ' ') {
ut32 fd = input[2]? r_num_math (core->num, input + 2): r_io_fd_get_current (core->io);
RIODesc *desc = r_io_desc_get (core->io, fd);
if (desc) {
Expand All @@ -1192,6 +1214,8 @@ static void cmd_open_map(RCore *core, const char *input) {
} else {
R_LOG_DEBUG ("Cannot find any fd to map");
}
} else {
r_core_return_invalid_command (core, "omm", input[2]);
}
break;
case '-': // "om-"
Expand All @@ -1200,12 +1224,28 @@ static void cmd_open_map(RCore *core, const char *input) {
} else if (input[2] == '*') {
r_io_map_reset (core->io);
} else {
r_io_map_del (core->io, r_num_math (core->num, input + 2));
const char *arg = r_str_trim_head_ro (input + 2);
const int mapid = r_num_math (core->num, arg);
if (core->num->nc.errors != 0) {
R_LOG_ERROR ("Invalid mapid %s", arg);
} else {
r_io_map_del (core->io, mapid);
}
}
break;
case 'u': // "omu"
// same as "om", but checks if already exists
cmd_om (core, input + 1, 'u');
case 'u': // "omu" -- same as "om", but checks if already exists
switch (input[2]) {
case '?':
r_core_cmd_help_match (core, help_msg_om, "omu");
break;
case 0:
case ' ':
cmd_om (core, input + 1, 'u');
break;
default:
r_core_return_invalid_command (core, "omu", input[2]);
break;
}
break;
case 'd': // "omd"
cmd_omd (core, input + 2);
Expand All @@ -1223,9 +1263,12 @@ static void cmd_open_map(RCore *core, const char *input) {
r_str_argv_free (argv);
}
break;
default:
case '?':
r_core_cmd_help (core, help_msg_om);
break;
default:
r_core_return_invalid_command (core, "omf", input[2]);
break;
}
break;
case '\0': // "om"
Expand Down Expand Up @@ -1277,15 +1320,19 @@ static void cmd_open_map(RCore *core, const char *input) {
r_table_visual_list (table, list, core->offset, core->blocksize,
r_cons_get_size (NULL), r_config_get_i (core->config, "scr.color"));
char *tablestr = r_table_tostring (table);
r_cons_printf ("\n%s\n", tablestr);
if (tablestr) {
r_cons_printf ("\n%s\n", tablestr);
free (tablestr);
}
r_table_free (table);
r_list_free (list);
free (tablestr);
} break;
default:
case '?':
r_core_cmd_help (core, help_msg_om);
break;
default:
r_core_return_invalid_command (core, "om", input[1]);
break;
}
R_FREE (s);
r_core_block_read (core);
Expand Down
Loading

0 comments on commit 31864f3

Please sign in to comment.