|
@@ -566,7 +566,7 @@ char *dfs_normalize_path(const char *directory, const char *filename)
|
|
|
#ifdef DFS_USING_WORKDIR
|
|
#ifdef DFS_USING_WORKDIR
|
|
|
if (directory == NULL) /* shall use working directory */
|
|
if (directory == NULL) /* shall use working directory */
|
|
|
{
|
|
{
|
|
|
- directory = lwp_dir_get();
|
|
|
|
|
|
|
+ directory = lwp_dir_get();
|
|
|
}
|
|
}
|
|
|
#else
|
|
#else
|
|
|
if ((directory == NULL) && (filename[0] != '/'))
|
|
if ((directory == NULL) && (filename[0] != '/'))
|
|
@@ -724,15 +724,15 @@ struct dfs_fdtable *dfs_fdtable_get_global(void)
|
|
|
return &_fdtab;
|
|
return &_fdtab;
|
|
|
}
|
|
}
|
|
|
void lwp_dir_set(char *buf)
|
|
void lwp_dir_set(char *buf)
|
|
|
-{
|
|
|
|
|
- if(strlen(buf) >= DFS_PATH_MAX)
|
|
|
|
|
- {
|
|
|
|
|
- rt_kprintf("buf too long!\n");
|
|
|
|
|
- return ;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+{
|
|
|
|
|
+ if(strlen(buf) >= DFS_PATH_MAX)
|
|
|
|
|
+ {
|
|
|
|
|
+ rt_kprintf("buf too long!\n");
|
|
|
|
|
+ return ;
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
#ifdef RT_USING_LWP
|
|
#ifdef RT_USING_LWP
|
|
|
- struct rt_lwp *lwp;
|
|
|
|
|
|
|
+ struct rt_lwp *lwp;
|
|
|
|
|
|
|
|
lwp = (struct rt_lwp *)rt_thread_self()->lwp;
|
|
lwp = (struct rt_lwp *)rt_thread_self()->lwp;
|
|
|
if (lwp)
|
|
if (lwp)
|
|
@@ -742,12 +742,12 @@ void lwp_dir_set(char *buf)
|
|
|
#else
|
|
#else
|
|
|
strncpy(working_directory, buf, DFS_PATH_MAX);
|
|
strncpy(working_directory, buf, DFS_PATH_MAX);
|
|
|
#endif
|
|
#endif
|
|
|
- return ;
|
|
|
|
|
|
|
+ return ;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
char *lwp_dir_get(void)
|
|
char *lwp_dir_get(void)
|
|
|
{
|
|
{
|
|
|
- char *dir_buf;
|
|
|
|
|
|
|
+ char *dir_buf;
|
|
|
#ifdef RT_USING_LWP
|
|
#ifdef RT_USING_LWP
|
|
|
struct rt_lwp *lwp;
|
|
struct rt_lwp *lwp;
|
|
|
|
|
|
|
@@ -759,7 +759,7 @@ char *lwp_dir_get(void)
|
|
|
#else
|
|
#else
|
|
|
dir_buf = &working_directory[0];
|
|
dir_buf = &working_directory[0];
|
|
|
#endif
|
|
#endif
|
|
|
- return dir_buf;
|
|
|
|
|
|
|
+ return dir_buf;
|
|
|
}
|
|
}
|
|
|
#ifdef RT_USING_FINSH
|
|
#ifdef RT_USING_FINSH
|
|
|
#include <finsh.h>
|
|
#include <finsh.h>
|