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

[shell] Fix compiling issue when DFS is not enable

Browse Source
This commit is contained in:
bernard 2014-09-11 12:47:25 +08:00
parent d0a7861534
commit a8b0fe3f36
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/finsh/msh.c
View File

@ -315,12 +315,15 @@ int msh_exec(char* cmd, rt_size_t length)
return 0; return 0;
} }
#endif #endif
#ifdef DFS_USING_WORKDIR
#if defined(RT_USING_DFS) && defined(DFS_USING_WORKDIR)
/* change to this directory */
if (chdir(cmd) == 0) if (chdir(cmd) == 0)
{ {
return 0; return 0;
} }
#endif #endif
/* truncate the cmd at the first space. */ /* truncate the cmd at the first space. */
{ {
char *tcmd; char *tcmd;

3
components/finsh/msh_cmd.c
View File

@ -249,6 +249,7 @@ int cmd_ifconfig(int argc, char** argv)
} }
FINSH_FUNCTION_EXPORT_ALIAS(cmd_ifconfig, __cmd_ifconfig, list the information of network interfaces); FINSH_FUNCTION_EXPORT_ALIAS(cmd_ifconfig, __cmd_ifconfig, list the information of network interfaces);
#ifdef RT_LWIP_TCP
int cmd_netstat(int argc, char** argv) int cmd_netstat(int argc, char** argv)
{ {
extern void list_tcps(void); extern void list_tcps(void);
@ -257,7 +258,7 @@ int cmd_netstat(int argc, char** argv)
return 0; return 0;
} }
FINSH_FUNCTION_EXPORT_ALIAS(cmd_netstat, __cmd_netstat, list the information of TCP/IP); FINSH_FUNCTION_EXPORT_ALIAS(cmd_netstat, __cmd_netstat, list the information of TCP/IP);
#endif
#endif /* RT_USING_LWIP */ #endif /* RT_USING_LWIP */
int cmd_ps(int argc, char** argv) int cmd_ps(int argc, char** argv)

5
components/finsh/shell.c
View File

@ -70,10 +70,11 @@ const char* finsh_get_prompt()
#endif #endif
strcpy(finsh_prompt, _PROMPT); strcpy(finsh_prompt, _PROMPT);
#ifdef DFS_USING_WORKDIR #if defined(RT_USING_DFS) && defined(DFS_USING_WORKDIR)
/* get current working directory */ /* get current working directory */
getcwd(&finsh_prompt[rt_strlen(finsh_prompt)], RT_CONSOLEBUF_SIZE - rt_strlen(finsh_prompt)); getcwd(&finsh_prompt[rt_strlen(finsh_prompt)], RT_CONSOLEBUF_SIZE - rt_strlen(finsh_prompt));
#endif #endif
strcat(finsh_prompt, ">"); strcat(finsh_prompt, ">");
return finsh_prompt; return finsh_prompt;
@ -307,7 +308,7 @@ void finsh_thread_entry(void* parameter)
shell->device = rt_console_get_device(); shell->device = rt_console_get_device();
RT_ASSERT(shell->device); RT_ASSERT(shell->device);
rt_device_set_rx_indicate(shell->device, finsh_rx_ind); rt_device_set_rx_indicate(shell->device, finsh_rx_ind);
rt_device_open(shell->device, RT_DEVICE_OFLAG_RDWR | RT_DEVICE_FLAG_INT_RX); rt_device_open(shell->device, (RT_DEVICE_OFLAG_RDWR | RT_DEVICE_FLAG_STREAM | RT_DEVICE_FLAG_INT_RX));
#else #else
RT_ASSERT(shell->device); RT_ASSERT(shell->device);
#endif #endif