From 9a74cb09e5c30cfa749b9265f05ab1e5a1ac4a87 Mon Sep 17 00:00:00 2001 From: lvyuanyuan Date: Fri, 26 May 2023 07:41:17 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B6=85=E5=A4=A7=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lvyuanyuan Change-Id: If8cfd35ce53b8f1cb259d942a9929723351be05b --- tools/backup_tool/src/tools_op_restore.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/backup_tool/src/tools_op_restore.cpp b/tools/backup_tool/src/tools_op_restore.cpp index f978d3a42..9ef8cd57a 100644 --- a/tools/backup_tool/src/tools_op_restore.cpp +++ b/tools/backup_tool/src/tools_op_restore.cpp @@ -240,6 +240,10 @@ static bool GetRealPath(string &path) return false; } path = absPath.get(); + + if (access(path.data(), F_OK) != 0) { + return false; + } return true; } @@ -252,10 +256,6 @@ static int32_t InitPathCapFile(const string &pathCapFile, vector bundleN return -errno; } - if (access(realPath.data(), F_OK) != 0) { - return -errno; - } - UniqueFd fd(open(realPath.data(), O_RDWR, S_IRWXU)); if (fd < 0) { fprintf(stderr, "Failed to open file error: %d %s\n", errno, strerror(errno)); -- Gitee From ca1f3706cfc5b10e66bc8e9c7ef51032e4bbbf65 Mon Sep 17 00:00:00 2001 From: lvyuanyuan Date: Fri, 26 May 2023 08:15:26 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B6=85=E5=A4=A7=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lvyuanyuan Change-Id: I9ff5c8939067c6aca82cdbda5987bc080e1fe410 --- tools/backup_tool/src/tools_op_restore.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/backup_tool/src/tools_op_restore.cpp b/tools/backup_tool/src/tools_op_restore.cpp index 9ef8cd57a..c5259997f 100644 --- a/tools/backup_tool/src/tools_op_restore.cpp +++ b/tools/backup_tool/src/tools_op_restore.cpp @@ -239,11 +239,12 @@ static bool GetRealPath(string &path) if (realpath(path.c_str(), absPath.get()) == nullptr) { return false; } - path = absPath.get(); + path = absPath.get(); if (access(path.data(), F_OK) != 0) { return false; } + return true; } -- Gitee