RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2008-12-19 Sebastian Huber <sebastian.huber@embedded-brains.de>

Browse Source 
* libblock/src/ide_part_table.c: Fixed NULL pointer access.
	* libmisc/monitor/mon-command.c, libmisc/monitor/mon-editor.c,
	libmisc/monitor/mon-monitor.c, libmisc/monitor/monitor.h,
	libmisc/shell/cmds.c: The list of registered monitor commands is now
	private and only accessible via a lookup and iterate function.
This commit is contained in:
Joel Sherrill
2008-12-19 14:59:35 +00:00
parent 52410c2695
commit eb96196183
7 changed files with 118 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
cpukit/libmisc/shell/cmds.c
View File

@@ -36,7 +36,7 @@ int rtems_shell_main_monitor(int argc, char **argv) {
return 1;
}
command = rtems_monitor_command_lookup(rtems_monitor_commands, argv [0]);
command = rtems_monitor_command_lookup(argv [0]);
if (command == NULL) {
return 1;
@@ -47,30 +47,31 @@ int rtems_shell_main_monitor(int argc, char **argv) {
return 0;
}
void rtems_shell_register_monitor_commands(void)
static bool rtems_shell_register_command(const rtems_monitor_command_entry_t *e, void *arg)
{
/* Monitor topic */
const rtems_monitor_command_entry_t *e = rtems_monitor_commands;
while (e != NULL) {
/* Exclude EXIT (alias quit)*/
if (e->command != NULL && strcmp("exit", e->command) != 0) {
rtems_shell_cmd_t *shell_cmd =
(rtems_shell_cmd_t *) malloc(sizeof(rtems_shell_cmd_t));
if (shell_cmd != NULL) {
shell_cmd->name = e->command;
shell_cmd->topic = "monitor";
shell_cmd->usage = e->usage;
shell_cmd->command = rtems_shell_main_monitor;
shell_cmd->alias = NULL;
shell_cmd->next = NULL;
if (rtems_shell_add_cmd_struct(shell_cmd) == NULL) {
free(shell_cmd);
}
/* Exclude EXIT (alias quit)*/
if (strcmp("exit", e->command) != 0) {
rtems_shell_cmd_t *shell_cmd =
(rtems_shell_cmd_t *) malloc(sizeof(rtems_shell_cmd_t));
if (shell_cmd != NULL) {
shell_cmd->name = e->command;
shell_cmd->topic = "monitor";
shell_cmd->usage = e->usage;
shell_cmd->command = rtems_shell_main_monitor;
shell_cmd->alias = NULL;
shell_cmd->next = NULL;
if (rtems_shell_add_cmd_struct(shell_cmd) == NULL) {
free(shell_cmd);
}
}
e = e->next;
}
return true;
}
void rtems_shell_register_monitor_commands(void)
{
rtems_monitor_command_iterate(rtems_shell_register_command, NULL);
}