summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard.Xiong <[email protected]>2015-03-22 08:57:02 +0800
committerBernard.Xiong <[email protected]>2015-03-22 08:57:02 +0800
commite2cfb1f796adf8e8be10b19af43ffe1caee0cd15 (patch)
tree4a123c9ea4e6dd6976e46ede1c9a75125951311e
parentcf37bccae40a364bc99ce648c286096eb51abe81 (diff)
parent5b1270455d6700e21c043f2cd5794fc0f88618ae (diff)
Merge branch 'master' of https://coding.net/bernard/rt-thread
-rw-r--r--components/finsh/cmd.c1
-rw-r--r--components/finsh/shell.c3
2 files changed, 2 insertions, 2 deletions
diff --git a/components/finsh/cmd.c b/components/finsh/cmd.c
index e449e0c2dc..7d24a33d6a 100644
--- a/components/finsh/cmd.c
+++ b/components/finsh/cmd.c
@@ -623,7 +623,6 @@ int list_mod_detail(const char *name)
return 0;
}
FINSH_FUNCTION_EXPORT(list_mod_detail, list module objects in system)
-MSH_CMD_EXPORT(list_mod_detail, list module objects in system)
#endif
long list(void)
diff --git a/components/finsh/shell.c b/components/finsh/shell.c
index 125dcec198..f28e235b3f 100644
--- a/components/finsh/shell.c
+++ b/components/finsh/shell.c
@@ -526,7 +526,8 @@ void finsh_thread_entry(void* parameter)
else
{
shell->line[shell->line_position] = ch;
- rt_kprintf("%c", ch);
+ if (shell->echo_mode)
+ rt_kprintf("%c", ch);
}
ch = 0;