chinky/rtt-f030
chinky
/
rtt-f030
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #231 from roamboy/master 

Update msh.c
This commit is contained in:
Bernard Xiong 2014-01-13 00:05:16 -08:00
parent 97508eb48e 1c8693c87e
commit 2970723cb0
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
components/finsh/msh.c
View File

@ -253,26 +253,38 @@ int msh_exec(char* cmd, rt_size_t length)
{
int argc;
char *argv[RT_FINSH_ARG_MAX];
int cmd0_size = 0;
int cmd0_size = 0;
cmd_function_t cmd_func;
while ((cmd[cmd0_size] != ' ' && cmd[cmd0_size] != '\t') && cmd0_size < length)
cmd0_size ++;
/* try to get built-in command */
cmd_func = msh_get_cmd(cmd, cmd0_size);
if (cmd_func == RT_NULL)
{
while(*cmd == ' ')
{
cmd++;
length--;
}
while ((cmd[cmd0_size] != ' ' && cmd[cmd0_size] != '\t') && cmd0_size < length)
cmd0_size ++;
/* try to get built-in command */
if (cmd0_size == 0) return -1;
cmd_func = msh_get_cmd(cmd, cmd0_size);
if (cmd_func == RT_NULL)
{
#ifdef RT_USING_MODULE
msh_exec_module(cmd, length);
msh_exec_module(cmd, length);
#else
rt_kprintf("%s: command not found.\n", argv[0]);
argv[0] = cmd;
while(*cmd != ' ')
{
if (*cmd == 0) break;
cmd++;
}
if (*cmd == ' ') *cmd = 0;
rt_kprintf("%s: command not found.\n", argv[0]);
#endif
return -1;
}
return -1;
}
/* split arguments */
/* split arguments */
memset(argv, 0x00, sizeof(argv));
argc = msh_split(cmd, length, argv);
if (argc == 0) return -1;