From 9933755954ca9ebbd7762cef1dc67f3e29b5b420 Mon Sep 17 00:00:00 2001
From: "@lin12345678" <linzhenxing@rt-thread.com>
Date: Sat, 28 Aug 2021 15:42:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=85=E6=A0=B8=E4=BD=BF=E7=94=A8lwp=5Fgetcw?=
 =?UTF-8?q?d=E6=89=93=E5=BC=80=E6=96=87=E4=BB=B6=E6=9C=89=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=EF=BC=8C=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/dfs/src/dfs_posix.c |  4 ----
 components/lwp/lwp.c           | 11 ++++++++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/components/dfs/src/dfs_posix.c b/components/dfs/src/dfs_posix.c
index 3b6ecb5ad9..f7007f3ce6 100644
--- a/components/dfs/src/dfs_posix.c
+++ b/components/dfs/src/dfs_posix.c
@@ -936,10 +936,6 @@ char *getcwd(char *buf, size_t size)
     dfs_lock();
 #ifdef RT_USING_LWP
     dir_buf = lwp_getcwd();
-    if(dir_buf[0] != '/')
-    {
-        dir_buf = &working_directory[0];
-    }
     rt_strncpy(buf, dir_buf, size);
 #else
     dir_buf = &working_directory[0];
diff --git a/components/lwp/lwp.c b/components/lwp/lwp.c
index 523451cb60..d89fb7d92a 100644
--- a/components/lwp/lwp.c
+++ b/components/lwp/lwp.c
@@ -80,7 +80,16 @@ char *lwp_getcwd(void)
 
     lwp = (struct rt_lwp *)rt_thread_self()->lwp;
     if (lwp)
-        dir_buf = &lwp->working_directory[0];
+    {
+        if(lwp->working_directory[0] != '/')
+        {
+            dir_buf = &working_directory[0];
+        }
+        else
+        {
+            dir_buf = &lwp->working_directory[0];
+        }
+    }
     else
         dir_buf = &working_directory[0];
 #else
-- 
Gitee