@lin12345678 4 лет назад
Родитель
Сommit
260a59493d
2 измененных файлов с 18 добавлено и 18 удалено
  1. 11 11
      components/dfs/src/dfs.c
  2. 7 7
      components/dfs/src/dfs_posix.c

+ 11 - 11
components/dfs/src/dfs.c

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

+ 7 - 7
components/dfs/src/dfs_posix.c

@@ -895,16 +895,16 @@ int access(const char *path, int amode)
  * @return the returned current directory.
  */
 char *getcwd(char *buf, size_t size)
-{	
-	char *dir_buf;
+{
+    char *dir_buf;
 #ifdef DFS_USING_WORKDIR
     dfs_lock();
     dir_buf = lwp_dir_get();
-	if(dir_buf[0] != '/')
-	{
-		dir_buf = &working_directory[0];	
-	}
-	strncpy(buf, dir_buf, size);
+    if(dir_buf[0] != '/')
+    {
+        dir_buf = &working_directory[0];
+    }
+    strncpy(buf, dir_buf, size);
     dfs_unlock();
 #else
     rt_kprintf(NO_WORKING_DIR);