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

[Finsh] fix strncmp issue in command search

Browse Source
This commit is contained in:
bernard 2014-01-16 22:22:23 +08:00
parent 2970723cb0
commit ae891e2011
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
components/finsh/msh.c
View File

@ -166,7 +166,8 @@ static cmd_function_t msh_get_cmd(char *cmd, int size)
{ {
if (strncmp(index->name, "__cmd_", 6) != 0) continue; if (strncmp(index->name, "__cmd_", 6) != 0) continue;
if (strncmp(&index->name[6], cmd, size) == 0) if (strncmp(&index->name[6], cmd, size) == 0 &&
index->name[6 + size] == '\0')
{ {
cmd_func = (cmd_function_t)index->func; cmd_func = (cmd_function_t)index->func;
break; break;
@ -256,16 +257,14 @@ int msh_exec(char* cmd, rt_size_t length)
int cmd0_size = 0; int cmd0_size = 0;
cmd_function_t cmd_func; cmd_function_t cmd_func;
while(*cmd == ' ') /* strim the beginning of command */
{ while(*cmd == ' ' || *cmd == '\t'){cmd++; length--;}
cmd++; /* find the size of first command */
length--;
}
while ((cmd[cmd0_size] != ' ' && cmd[cmd0_size] != '\t') && cmd0_size < length) while ((cmd[cmd0_size] != ' ' && cmd[cmd0_size] != '\t') && cmd0_size < length)
cmd0_size ++; cmd0_size ++;
if (cmd0_size == 0) return -1; /* no command found */
/* try to get built-in command */ /* try to get built-in command */
if (cmd0_size == 0) return -1;
cmd_func = msh_get_cmd(cmd, cmd0_size); cmd_func = msh_get_cmd(cmd, cmd0_size);
if (cmd_func == RT_NULL) if (cmd_func == RT_NULL)
{ {