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

2008-01-11 Joel Sherrill <joel.sherrill@oarcorp.com>

Browse Source 
* libmisc/shell/shell.c: When stdin or stdout is NULL, just use
	existing one.
This commit is contained in:
Joel Sherrill
2008-01-11 21:42:48 +00:00
parent eabd9f06e7
commit be8ab6a72d
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cpukit/ChangeLog
View File

@@ -1,3 +1,8 @@
2008-01-11 Joel Sherrill <joel.sherrill@oarcorp.com>
* libmisc/shell/shell.c: When stdin or stdout is NULL, just use
existing one.
2008-01-09 Joel Sherrill <joel.sherrill@OARcorp.com> 2008-01-09 Joel Sherrill <joel.sherrill@OARcorp.com>
* score/include/rtems/score/wkspace.h, * score/include/rtems/score/wkspace.h,

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

@@ -68,7 +68,7 @@ rtems_shell_env_t *rtems_shell_init_env(
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 )
return NULL; return NULL;
*shell_env = rtems_global_shell_env; *shell_env = rtems_global_shell_env;
shell_env->taskname = NULL; shell_env->taskname = NULL;
} }
@@ -397,7 +397,10 @@ rtems_boolean rtems_shell_main_loop(
fileno(stdout); fileno(stdout);
if (strcmp(shell_env->output, "stdout") != 0) { fprintf( stderr,
"-%s-%s-\n", shell_env->input, shell_env->output );
if (shell_env->output && strcmp(shell_env->output, "stdout") != 0) {
if (strcmp(shell_env->output, "stderr") == 0) { if (strcmp(shell_env->output, "stderr") == 0) {
stdout = stderr; stdout = stderr;
} else if (strcmp(shell_env->output, "/dev/null") == 0) { } else if (strcmp(shell_env->output, "/dev/null") == 0) {
@@ -414,7 +417,7 @@ rtems_boolean rtems_shell_main_loop(
} }
} }
if (strcmp(shell_env_arg->input, "stdin") != 0) { if (shell_env->input && strcmp(shell_env_arg->input, "stdin") != 0) {
FILE *input = fopen(shell_env_arg->input, "r"); FILE *input = fopen(shell_env_arg->input, "r");
if (!input) { if (!input) {
fprintf(stderr, "shell: open input %s failed: %s\n", fprintf(stderr, "shell: open input %s failed: %s\n",