diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2014-11-17 15:42:57 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2014-11-20 10:30:24 +0100 |
| commit | bac3d6df3562c814e5892f63225b94e2fedd4684 (patch) | |
| tree | 773afea1364e51c9bf5ee8cca9f4de12b3829e26 /cpukit | |
| parent | Ensure security of default user environment (diff) | |
| download | rtems-bac3d6df3562c814e5892f63225b94e2fedd4684.tar.bz2 | |
shell: Rename HALT to SHUTDOWN command
Use a normal command for shutdown via exit().
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/libmisc/shell/main_halt.c | 11 | ||||
| -rw-r--r-- | cpukit/libmisc/shell/shell.c | 3 | ||||
| -rw-r--r-- | cpukit/libmisc/shell/shellconfig.h | 8 |
3 files changed, 10 insertions, 12 deletions
diff --git a/cpukit/libmisc/shell/main_halt.c b/cpukit/libmisc/shell/main_halt.c index 4db513d212..a7a7d2dc40 100644 --- a/cpukit/libmisc/shell/main_halt.c +++ b/cpukit/libmisc/shell/main_halt.c @@ -19,20 +19,21 @@ #include <rtems/shell.h> #include "internal.h" -static int rtems_shell_main_halt( +static int rtems_shell_main_shutdown( int argc __attribute__((unused)), char *argv[] __attribute__((unused)) ) { + fprintf(stdout, "System shutting down at user request\n"); exit(0); return 0; } -rtems_shell_cmd_t rtems_shell_HALT_Command = { - "halt", /* name */ - "halt", /* usage */ +rtems_shell_cmd_t rtems_shell_SHUTDOWN_Command = { + "shutdown", /* name */ + "shutdown", /* usage */ "rtems", /* topic */ - rtems_shell_main_halt, /* command */ + rtems_shell_main_shutdown, /* command */ NULL, /* alias */ NULL /* next */ }; diff --git a/cpukit/libmisc/shell/shell.c b/cpukit/libmisc/shell/shell.c index 14edf52a29..9a5ffb55b4 100644 --- a/cpukit/libmisc/shell/shell.c +++ b/cpukit/libmisc/shell/shell.c @@ -891,9 +891,6 @@ bool rtems_shell_main_loop( if (!strcmp(cmds[cmd],"bye") || !strcmp(cmds[cmd],"exit")) { fprintf(stdout, "Shell exiting\n" ); break; - } else if (!strcmp(cmds[cmd],"shutdown")) { /* exit application */ - fprintf(stdout, "System shutting down at user request\n" ); - exit(0); } /* exec cmd section */ diff --git a/cpukit/libmisc/shell/shellconfig.h b/cpukit/libmisc/shell/shellconfig.h index e58916e214..d9d6078272 100644 --- a/cpukit/libmisc/shell/shellconfig.h +++ b/cpukit/libmisc/shell/shellconfig.h @@ -76,7 +76,7 @@ extern rtems_shell_cmd_t rtems_shell_MD5_Command; extern rtems_shell_cmd_t rtems_shell_RTC_Command; -extern rtems_shell_cmd_t rtems_shell_HALT_Command; +extern rtems_shell_cmd_t rtems_shell_SHUTDOWN_Command; extern rtems_shell_cmd_t rtems_shell_CPUUSE_Command; extern rtems_shell_cmd_t rtems_shell_TOP_Command; extern rtems_shell_cmd_t rtems_shell_STACKUSE_Command; @@ -400,9 +400,9 @@ extern rtems_shell_alias_t *rtems_shell_Initial_aliases[]; * RTEMS Related commands */ #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ - !defined(CONFIGURE_SHELL_NO_COMMAND_HALT)) || \ - defined(CONFIGURE_SHELL_COMMAND_HALT) - &rtems_shell_HALT_Command, + !defined(CONFIGURE_SHELL_NO_COMMAND_SHUTDOWN)) || \ + defined(CONFIGURE_SHELL_COMMAND_SHUTDOWN) + &rtems_shell_SHUTDOWN_Command, #endif #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ !defined(CONFIGURE_SHELL_NO_COMMAND_CPUUSE)) || \ |