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

* libmisc/shell/shell.c, libmisc/shell/shell.h: Changed type for

Browse Source 
boolean values from 'int' to 'bool'.  Added option 'login' to enable or
	disable a login prompt.  Changed intialization of global shell
	environment to static initialization.  Changed stack size type to
	'size_t' conforming to classic API.

	* libmisc/shell/shellconfig.h: Fixed some typos.
This commit is contained in:
Thomas Doerfler
2009-02-27 11:03:57 +00:00
parent 9cc70d8007
commit 06f8e558b7
4 changed files with 76 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cpukit/ChangeLog
View File

@@ -1,3 +1,13 @@
2009-02-27 Sebastian Huber <sebastian.huber@embedded-brains.de>
* libmisc/shell/shell.c, libmisc/shell/shell.h: Changed type for
boolean values from 'int' to 'bool'. Added option 'login' to enable or
disable a login prompt. Changed intialization of global shell
environment to static initialization. Changed stack size type to
'size_t' conforming to classic API.
* libmisc/shell/shellconfig.h: Fixed some typos.
2009-02-20 Ralf Corsepius <ralf.corsepius@rtems.org> 2009-02-20 Ralf Corsepius <ralf.corsepius@rtems.org>
* include/sys/priority.h: New. * include/sys/priority.h: New.

81
cpukit/libmisc/shell/shell.c
View File

@@ -28,6 +28,7 @@
#include <rtems/system.h> #include <rtems/system.h>
#include <rtems/shell.h> #include <rtems/shell.h>
#include <rtems/shellconfig.h> #include <rtems/shellconfig.h>
#include <rtems/console.h>
#include "internal.h" #include "internal.h"
#include <termios.h> #include <termios.h>
@@ -39,31 +40,31 @@
#include <errno.h> #include <errno.h>
#include <pwd.h> #include <pwd.h>
rtems_shell_env_t rtems_global_shell_env; rtems_shell_env_t rtems_global_shell_env = {
rtems_shell_env_t *rtems_current_shell_env; .magic = rtems_build_name('S', 'E', 'N', 'V'),
.devname = CONSOLE_DEVICE_NAME,
.taskname = "SHGL",
.exit_shell = false,
.forever = true,
.errorlevel = -1,
.echo = false,
.cwd = "/",
.input = NULL,
.output = NULL,
.output_append = false,
.wake_on_end = RTEMS_ID_NONE,
.login = true
};
rtems_shell_env_t *rtems_current_shell_env = &rtems_global_shell_env;
/* /*
* Initialize the shell user/process environment information * Initialize the shell user/process environment information
*/ */
rtems_shell_env_t *rtems_shell_init_env( rtems_shell_env_t *rtems_shell_init_env(
rtems_shell_env_t *shell_env_arg rtems_shell_env_t *shell_env
) )
{ {
rtems_shell_env_t *shell_env;
if (rtems_global_shell_env.magic != 0x600D600d) {
rtems_global_shell_env.magic = 0x600D600d;
rtems_global_shell_env.devname = "";
rtems_global_shell_env.taskname = "GLOBAL";
rtems_global_shell_env.exit_shell = 0;
rtems_global_shell_env.forever = TRUE;
rtems_global_shell_env.input = 0;
rtems_global_shell_env.output = 0;
rtems_global_shell_env.output_append = 0;
}
shell_env = shell_env_arg;
if ( !shell_env ) { if ( !shell_env ) {
shell_env = malloc(sizeof(rtems_shell_env_t)); shell_env = malloc(sizeof(rtems_shell_env_t));
if ( !shell_env ) if ( !shell_env )
@@ -807,11 +808,10 @@ bool rtems_shell_main_loop(
* loop when the connection is dropped during login and * loop when the connection is dropped during login and
* keep on trucking. * keep on trucking.
*/ */
if ( input_file ) { if (shell_env->login) {
result = true; result = rtems_shell_login(stdin,stdout) == 0;
} else { } else {
if (rtems_shell_login(stdin,stdout)) result = false; result = true;
else result = true;
} }
if (result) { if (result) {
@@ -939,16 +939,17 @@ bool rtems_shell_main_loop(
/* ----------------------------------------------- */ /* ----------------------------------------------- */
static rtems_status_code rtems_shell_run ( static rtems_status_code rtems_shell_run (
const char *task_name, const char *task_name,
uint32_t task_stacksize, size_t task_stacksize,
rtems_task_priority task_priority, rtems_task_priority task_priority,
const char *devname, const char *devname,
int forever, bool forever,
int wait, bool wait,
const char* input, const char* input,
const char* output, const char* output,
int output_append, bool output_append,
rtems_id wake_on_end, rtems_id wake_on_end,
int echo bool echo,
bool login
) )
{ {
rtems_id task_id; rtems_id task_id;
@@ -990,6 +991,7 @@ static rtems_status_code rtems_shell_run (
shell_env->output = strdup (output); shell_env->output = strdup (output);
shell_env->output_append = output_append; shell_env->output_append = output_append;
shell_env->wake_on_end = wake_on_end; shell_env->wake_on_end = wake_on_end;
shell_env->login = login;
getcwd(shell_env->cwd, sizeof(shell_env->cwd)); getcwd(shell_env->cwd, sizeof(shell_env->cwd));
@@ -1010,14 +1012,15 @@ static rtems_status_code rtems_shell_run (
rtems_status_code rtems_shell_init( rtems_status_code rtems_shell_init(
const char *task_name, const char *task_name,
uint32_t task_stacksize, size_t task_stacksize,
rtems_task_priority task_priority, rtems_task_priority task_priority,
const char *devname, const char *devname,
int forever, bool forever,
int wait bool wait,
bool login
) )
{ {
rtems_id to_wake = RTEMS_INVALID_ID; rtems_id to_wake = RTEMS_ID_NONE;
if ( wait ) if ( wait )
to_wake = rtems_task_self(); to_wake = rtems_task_self();
@@ -1031,21 +1034,22 @@ rtems_status_code rtems_shell_init(
wait, /* wait */ wait, /* wait */
"stdin", /* input */ "stdin", /* input */
"stdout", /* output */ "stdout", /* output */
0, /* output_append */ false, /* output_append */
to_wake, /* wake_on_end */ to_wake, /* wake_on_end */
0 /* echo */ false, /* echo */
login /* login */
); );
} }
rtems_status_code rtems_shell_script ( rtems_status_code rtems_shell_script (
const char *task_name, const char *task_name,
uint32_t task_stacksize, size_t task_stacksize,
rtems_task_priority task_priority, rtems_task_priority task_priority,
const char* input, const char* input,
const char* output, const char* output,
int output_append, bool output_append,
int wait, bool wait,
int echo bool echo
) )
{ {
rtems_id current_task = RTEMS_INVALID_ID; rtems_id current_task = RTEMS_INVALID_ID;
@@ -1068,7 +1072,8 @@ rtems_status_code rtems_shell_script (
output, /* output */ output, /* output */
output_append, /* output_append */ output_append, /* output_append */
current_task, /* wake_on_end */ current_task, /* wake_on_end */
echo /* echo */ echo, /* echo */
false /* login */
); );
if (sc != RTEMS_SUCCESSFUL) if (sc != RTEMS_SUCCESSFUL)
return sc; return sc;

23
cpukit/libmisc/shell/shell.h
View File

@@ -134,16 +134,18 @@ int rtems_shell_script_file(
* @param task_stacksize The size of the stack. If 0 the default size is used. * @param task_stacksize The size of the stack. If 0 the default size is used.
* @param task_priority The priority the shell runs at. * @param task_priority The priority the shell runs at.
* @param forever Repeat logins. * @param forever Repeat logins.
* @param wait Caller should block until shell exits * @param wait Caller should block until shell exits.
* @param login Demand user login.
* *
*/ */
rtems_status_code rtems_shell_init( rtems_status_code rtems_shell_init(
const char *task_name, const char *task_name,
uint32_t task_stacksize, /*0 default*/ size_t task_stacksize, /* 0 default*/
rtems_task_priority task_priority, rtems_task_priority task_priority,
const char *devname, const char *devname,
int forever, bool forever,
int wait bool wait,
bool login
); );
/** /**
@@ -161,13 +163,13 @@ rtems_status_code rtems_shell_init(
*/ */
rtems_status_code rtems_shell_script( rtems_status_code rtems_shell_script(
const char *task_name, const char *task_name,
uint32_t task_stacksize, /*0 default*/ size_t task_stacksize, /* 0 default*/
rtems_task_priority task_priority, rtems_task_priority task_priority,
const char *input, const char *input,
const char *output, const char *output,
int output_append, bool output_append,
int wait, bool wait,
int echo bool echo
); );
/* /*
@@ -184,12 +186,13 @@ typedef struct {
bool exit_shell; /* logout */ bool exit_shell; /* logout */
bool forever ; /* repeat login */ bool forever ; /* repeat login */
int errorlevel; int errorlevel;
int echo; bool echo;
char cwd[256]; char cwd[256];
const char* input; const char* input;
const char* output; const char* output;
int output_append; bool output_append;
rtems_id wake_on_end; rtems_id wake_on_end;
bool login;
} rtems_shell_env_t; } rtems_shell_env_t;
bool rtems_shell_main_loop( bool rtems_shell_main_loop(

22
cpukit/libmisc/shell/shellconfig.h
View File

@@ -61,11 +61,9 @@ extern rtems_shell_cmd_t rtems_shell_PERIODUSE_Command;
extern rtems_shell_cmd_t rtems_shell_WKSPACE_INFO_Command; extern rtems_shell_cmd_t rtems_shell_WKSPACE_INFO_Command;
extern rtems_shell_cmd_t rtems_shell_MALLOC_INFO_Command; extern rtems_shell_cmd_t rtems_shell_MALLOC_INFO_Command;
#if RTEMS_NETWORKING #if RTEMS_NETWORKING
#if defined(CONFIGURE_SHELL_COMMANDS_ALL_NETWORKING) extern rtems_shell_cmd_t rtems_shell_IFCONFIG_Command;
extern rtems_shell_cmd_t rtems_shell_IFCONFIG_Command; extern rtems_shell_cmd_t rtems_shell_ROUTE_Command;
extern rtems_shell_cmd_t rtems_shell_ROUTE_Command; extern rtems_shell_cmd_t rtems_shell_NETSTATS_Command;
extern rtems_shell_cmd_t rtems_shell_NETSTATS_Command;
#endif
#endif #endif
extern rtems_shell_cmd_t *rtems_shell_Initial_commands[]; extern rtems_shell_cmd_t *rtems_shell_Initial_commands[];
@@ -326,7 +324,7 @@ extern rtems_shell_filesystems_t *rtems_shell_Mount_filesystems[];
&rtems_shell_PERIODUSE_Command, &rtems_shell_PERIODUSE_Command,
#endif #endif
#if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \
!defined(CONFIGURE_SHELL_COMMAND_WKSPACE_INFO)) || \ !defined(CONFIGURE_SHELL_NO_COMMAND_WKSPACE_INFO)) || \
defined(CONFIGURE_SHELL_COMMAND_WKSPACE_INFO) defined(CONFIGURE_SHELL_COMMAND_WKSPACE_INFO)
&rtems_shell_WKSPACE_INFO_Command, &rtems_shell_WKSPACE_INFO_Command,
#endif #endif
@@ -336,7 +334,7 @@ extern rtems_shell_filesystems_t *rtems_shell_Mount_filesystems[];
* Malloc family commands * Malloc family commands
*/ */
#if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \
!defined(CONFIGURE_SHELL_COMMAND_MALLOC_INFO)) || \ !defined(CONFIGURE_SHELL_NO_COMMAND_MALLOC_INFO)) || \
defined(CONFIGURE_SHELL_COMMAND_MALLOC_INFO) defined(CONFIGURE_SHELL_COMMAND_MALLOC_INFO)
&rtems_shell_MALLOC_INFO_Command, &rtems_shell_MALLOC_INFO_Command,
#endif #endif
@@ -346,19 +344,19 @@ extern rtems_shell_filesystems_t *rtems_shell_Mount_filesystems[];
*/ */
#if RTEMS_NETWORKING #if RTEMS_NETWORKING
#if (defined(CONFIGURE_SHELL_COMMANDS_ALL_NETWORKING) && \ #if (defined(CONFIGURE_SHELL_COMMANDS_ALL_NETWORKING) && \
!defined(CONFIGURE_SHELL_COMMAND_IFCONFIG)) || \ !defined(CONFIGURE_SHELL_NO_COMMAND_IFCONFIG)) || \
defined(CONFIGURE_SHELL_COMMAND_IFCONFIG) defined(CONFIGURE_SHELL_COMMAND_IFCONFIG)
&rtems_shell_IFCONFIG_Command, &rtems_shell_IFCONFIG_Command,
#endif #endif
#if (defined(CONFIGURE_SHELL_COMMANDS_ALL_NETWORKING) && \ #if (defined(CONFIGURE_SHELL_COMMANDS_ALL_NETWORKING) && \
!defined(CONFIGURE_SHELL_COMMAND_ROUTE)) || \ !defined(CONFIGURE_SHELL_NO_COMMAND_ROUTE)) || \
defined(CONFIGURE_SHELL_COMMAND_ROUTE) defined(CONFIGURE_SHELL_COMMAND_ROUTE)
&rtems_shell_ROUTE_Command, &rtems_shell_ROUTE_Command,
#endif #endif
#if (defined(CONFIGURE_SHELL_COMMANDS_ALL_NETWORKING) && \ #if (defined(CONFIGURE_SHELL_COMMANDS_ALL_NETWORKING) && \
!defined(CONFIGURE_SHELL_COMMAND_NETSTATS)) || \ !defined(CONFIGURE_SHELL_NO_COMMAND_NETSTATS)) || \
defined(CONFIGURE_SHELL_COMMAND_NETSTATS) defined(CONFIGURE_SHELL_COMMAND_NETSTATS)
&rtems_shell_NETSTATS_Command, &rtems_shell_NETSTATS_Command,
#endif #endif
@@ -377,8 +375,8 @@ extern rtems_shell_filesystems_t *rtems_shell_Mount_filesystems[];
* The mount command's support file system types. * The mount command's support file system types.
*/ */
#if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \ #if (defined(CONFIGURE_SHELL_COMMANDS_ALL) && \
!defined(CONFIGURE_SHELL_COMMAND_MOUNT)) || \ !defined(CONFIGURE_SHELL_COMMAND_NO_MOUNT)) || \
defined(CONFIGURE_SHELL_COMMAND_UNMOUNT) defined(CONFIGURE_SHELL_COMMAND_MOUNT)
rtems_shell_filesystems_t *rtems_shell_Mount_filesystems[] = { rtems_shell_filesystems_t *rtems_shell_Mount_filesystems[] = {
#if defined(CONFIGURE_SHELL_MOUNT_MSDOS) #if defined(CONFIGURE_SHELL_MOUNT_MSDOS)
&rtems_shell_Mount_MSDOS, &rtems_shell_Mount_MSDOS,