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

fix some bugs in finsh for NULL node. 

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@455 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
bernard.xiong 2010-03-01 06:41:13 +00:00
parent 9f58705a39
commit 8aaddbaf38
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
finsh/finsh_parser.c
View File

@ -656,9 +656,12 @@ static struct finsh_node* proc_cast_expr(struct finsh_parser* self)
match_token(token, &(self->token), finsh_token_type_right_paren); match_token(token, &(self->token), finsh_token_type_right_paren);
cast = proc_cast_expr(self); cast = proc_cast_expr(self);
if (cast != NULL)
{
cast->data_type = type; cast->data_type = type;
return cast; return cast;
} }
}
finsh_token_replay(&(self->token)); finsh_token_replay(&(self->token));
return proc_unary_expr(self); return proc_unary_expr(self);
@ -835,6 +838,7 @@ static struct finsh_node* proc_param_list(struct finsh_parser* self)
struct finsh_node *node, *assign; struct finsh_node *node, *assign;
assign = proc_assign_expr(self); assign = proc_assign_expr(self);
if (assign == NULL) return NULL;
node = assign; node = assign;
next_token(token, &(self->token)); next_token(token, &(self->token));
@ -867,8 +871,11 @@ static struct finsh_node* make_sys_node(u_char type, struct finsh_node* node1, s
node = finsh_node_allocate(type); node = finsh_node_allocate(type);
if (node1 != NULL)
{
finsh_node_child(node) = node1; finsh_node_child(node) = node1;
if (node1 != NULL) finsh_node_sibling(node1) = node2; finsh_node_sibling(node1) = node2;
}
else finsh_error_set(FINSH_ERROR_NULL_NODE); else finsh_error_set(FINSH_ERROR_NULL_NODE);
return node; return node;

2
finsh/shell.c
View File

@ -326,6 +326,8 @@ void finsh_thread_entry(void* parameter)
continue; continue;
} }
if (pos >= 256) /* it's a large line, discard it */
pos = 0;
line[pos] = ch; line[pos] = ch;
rt_kprintf("%c", line[pos]); rt_kprintf("%c", line[pos]);