@lin12345678 4 лет назад
Родитель
Сommit
02b62b34cd
2 измененных файлов с 8 добавлено и 8 удалено
  1. 3 3
      components/dfs/src/dfs.c
  2. 5 5
      components/dfs/src/dfs_posix.c

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

@@ -736,11 +736,11 @@ void lwp_dir_set(char *buf)
 
 
     lwp = (struct rt_lwp *)rt_thread_self()->lwp;
     lwp = (struct rt_lwp *)rt_thread_self()->lwp;
     if (lwp)
     if (lwp)
-        strncpy(lwp->working_directory, buf, DFS_PATH_MAX);
+        rt_strncpy(lwp->working_directory, buf, DFS_PATH_MAX);
     else
     else
-        strncpy(working_directory, buf, DFS_PATH_MAX);
+        rt_strncpy(working_directory, buf, DFS_PATH_MAX);
 #else
 #else
-    strncpy(working_directory, buf, DFS_PATH_MAX);
+    rt_strncpy(working_directory, buf, DFS_PATH_MAX);
 #endif
 #endif
     return ;
     return ;
 }
 }

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

@@ -900,11 +900,11 @@ char *getcwd(char *buf, size_t size)
 #ifdef DFS_USING_WORKDIR
 #ifdef DFS_USING_WORKDIR
     dfs_lock();
     dfs_lock();
     dir_buf = lwp_dir_get();
     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];	
+	}
+	rt_strncpy(buf, dir_buf, size);
     dfs_unlock();
     dfs_unlock();
 #else
 #else
     rt_kprintf(NO_WORKING_DIR);
     rt_kprintf(NO_WORKING_DIR);