From af9f296ebfe48159fa6858b947bfa26fdb1bedab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E6=A0=B9=E5=A0=82?= <magentang4@huawei.com>
Date: Tue, 27 Jun 2023 15:27:50 +0000
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E8=A3=85hap=E6=97=B6foundation?=
 =?UTF-8?q?=E8=BF=9B=E7=A8=8Bcrash?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 马根堂 <magentang4@huawei.com>
---
 base/src/directory_ex.cpp                     |  9 ++-
 .../unittest/common/utils_directory_test.cpp  | 72 +------------------
 2 files changed, 5 insertions(+), 76 deletions(-)

diff --git a/base/src/directory_ex.cpp b/base/src/directory_ex.cpp
index 9e79b9b..dd8e6f7 100644
--- a/base/src/directory_ex.cpp
+++ b/base/src/directory_ex.cpp
@@ -15,8 +15,7 @@
 
 #include "directory_ex.h"
 #include <dirent.h>
-#include <cerrno>
-#include <fcntl.h>
+#include <errno.h>
 #include "securec.h"
 #include "unistd.h"
 #include "utils_log.h"
@@ -218,7 +217,7 @@ bool ForceRemoveDirectory(const string& path)
         if (ptr->d_type == DT_DIR) {
             ret = ForceRemoveDirectory(subPath);
         } else {
-            if (faccessat(AT_FDCWD, subPath.c_str(), F_OK, AT_SYMLINK_NOFOLLOW) == 0) {
+            if (access(subPath.c_str(), F_OK) == 0) {
                 if (remove(subPath.c_str()) != 0) {
                     closedir(dir);
                     return false;
@@ -229,13 +228,13 @@ bool ForceRemoveDirectory(const string& path)
     closedir(dir);
 
     string currentPath = ExcludeTrailingPathDelimiter(path);
-    if (faccessat(AT_FDCWD, currentPath.c_str(), F_OK, AT_SYMLINK_NOFOLLOW) == 0) {
+    if (access(currentPath.c_str(), F_OK) == 0) {
         if (remove(currentPath.c_str()) != 0) {
             return false;
         }
     }
 
-    return ret && (faccessat(AT_FDCWD, path.c_str(), F_OK, AT_SYMLINK_NOFOLLOW) != 0);
+    return ret && (access(path.c_str(), F_OK) != 0);
 }
 
 bool RemoveFile(const string& fileName)
diff --git a/base/test/unittest/common/utils_directory_test.cpp b/base/test/unittest/common/utils_directory_test.cpp
index 3ac7148..d8d0f95 100644
--- a/base/test/unittest/common/utils_directory_test.cpp
+++ b/base/test/unittest/common/utils_directory_test.cpp
@@ -12,14 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-#include "directory_ex.h"
 #include <gtest/gtest.h>
-#include <fcntl.h>
+#include "directory_ex.h"
 #include <algorithm>
 #include <iostream>
 #include <fstream>
-
 using namespace testing::ext;
 using namespace std;
 
@@ -215,73 +212,6 @@ HWTEST_F(UtilsDirectoryTest, testRemoveFile001, TestSize.Level0)
     EXPECT_EQ(ret, true);
 }
 
-/*
- * @tc.name: testRemoveFile002
- * @tc.desc: Remove soft link file.
- */
-HWTEST_F(UtilsDirectoryTest, testRemoveFile002, TestSize.Level0)
-{
-    string dirpath = "/data/test_dir";
-    bool ret = ForceCreateDirectory(dirpath);
-    EXPECT_EQ(ret, true);
-
-    string targetname = "/data/test_target.txt";
-    FILE *fp = fopen(targetname.c_str(), "w");
-    if (NULL != fp) {
-        fclose(fp);
-    }
-
-    // symlink to a directory
-    string linkpath = "/data/test_symlink_dir";
-    int res = symlink(dirpath.c_str(), linkpath.c_str());
-    EXPECT_EQ(res, 0);
-
-    ret = ForceRemoveDirectory(linkpath);
-    EXPECT_EQ(ret, true);
-
-    // Target dir is not removed.
-    ret = faccessat(AT_FDCWD, dirpath.c_str(), F_OK, AT_SYMLINK_NOFOLLOW);
-    EXPECT_EQ(ret, 0);
-
-    // symlink to a file
-    string filename = dirpath + "/test.txt";
-    res = symlink(targetname.c_str(), filename.c_str());
-    EXPECT_EQ(res, 0);
-
-    ret = ForceRemoveDirectory(dirpath);
-    EXPECT_EQ(ret, true);
-
-    // Target file is not removed.
-    ret = faccessat(AT_FDCWD, targetname.c_str(), F_OK, AT_SYMLINK_NOFOLLOW);
-    EXPECT_EQ(ret, 0);
-
-    ret = RemoveFile(targetname);
-    EXPECT_EQ(ret, true);
-}
-
-/*
- * @tc.name: testRemoveFile003
- * @tc.desc: Remove dangling soft link file.
- */
-HWTEST_F(UtilsDirectoryTest, testRemoveFile003, TestSize.Level0)
-{
-    string dirpath = "/data/test_dir";
-    bool ret = ForceCreateDirectory(dirpath);
-    EXPECT_EQ(ret, true);
-
-    // symlink to a file
-    string targetname = "/data/nonexisted.txt";
-    string filename = dirpath + "/test.txt";
-    int res = symlink(targetname.c_str(), filename.c_str());
-    EXPECT_EQ(res, 0);
-
-    ret = ForceRemoveDirectory(dirpath);
-    EXPECT_EQ(ret, true);
-
-    ret = RemoveFile(targetname);
-    EXPECT_EQ(ret, true);
-}
-
 /*
  * @tc.name: testGetFolderSize001
  * @tc.desc: directory unit test
-- 
Gitee