libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #593 from SchumyHao/master 

finsh: change no echo mode. cpp: remove RT_USE_LIBC depends
This commit is contained in:
Bernard Xiong 2015-12-02 23:28:05 +08:00
parent 2c7c049af0 1eea52307b
commit d2aee25391
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/cplusplus/SConscript
View File

@ -6,6 +6,6 @@ cwd = GetCurrentDir()
src = Glob('*.cpp') + Glob('*.c') src = Glob('*.cpp') + Glob('*.c')
CPPPATH = [cwd] CPPPATH = [cwd]
group = DefineGroup('CPlusPlus', src, depend = ['RT_USING_CPLUSPLUS', 'RT_USING_LIBC'], CPPPATH = CPPPATH) group = DefineGroup('CPlusPlus', src, depend = ['RT_USING_CPLUSPLUS'], CPPPATH = CPPPATH)
Return('group') Return('group')

9
components/finsh/shell.c
View File

@ -200,7 +200,8 @@ void finsh_run_line(struct finsh_parser *parser, const char *line)
{ {
const char *err_str; const char *err_str;
rt_kprintf("\n"); if(shell->echo_mode)
rt_kprintf("\n");
finsh_parser_run(parser, (unsigned char *)line); finsh_parser_run(parser, (unsigned char *)line);
/* compile node root */ /* compile node root */
@ -489,7 +490,8 @@ void finsh_thread_entry(void *parameter)
#ifdef FINSH_USING_MSH #ifdef FINSH_USING_MSH
if (msh_is_used() == RT_TRUE) if (msh_is_used() == RT_TRUE)
{ {
rt_kprintf("\n"); if (shell->echo_mode)
rt_kprintf("\n");
msh_exec(shell->line, shell->line_position); msh_exec(shell->line, shell->line_position);
} }
else else
@ -500,7 +502,8 @@ void finsh_thread_entry(void *parameter)
shell->line[shell->line_position] = ';'; shell->line[shell->line_position] = ';';
if (shell->line_position != 0) finsh_run_line(&shell->parser, shell->line); if (shell->line_position != 0) finsh_run_line(&shell->parser, shell->line);
else rt_kprintf("\n"); else
if (shell->echo_mode) rt_kprintf("\n");
#endif #endif
} }