From c03a2715e628d32bd7e6f8739da1e24699f7adb4 Mon Sep 17 00:00:00 2001
From: tianp <tianpeng35@huawei.com>
Date: Sat, 8 Feb 2025 10:05:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BD=BF=E7=94=A8filesystem=E5=AF=B9?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E6=8B=BC=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: tianp <tianpeng35@huawei.com>
---
 .../kits/js/src/mod_fs/class_watcher/watcher_entity.cpp     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/interfaces/kits/js/src/mod_fs/class_watcher/watcher_entity.cpp b/interfaces/kits/js/src/mod_fs/class_watcher/watcher_entity.cpp
index 2cdb84a7e..ef1a6b527 100644
--- a/interfaces/kits/js/src/mod_fs/class_watcher/watcher_entity.cpp
+++ b/interfaces/kits/js/src/mod_fs/class_watcher/watcher_entity.cpp
@@ -20,6 +20,7 @@
 #include <poll.h>
 #include <sys/eventfd.h>
 #include <unistd.h>
+#include <filesystem>
 
 #include "filemgmt_libhilog.h"
 #include "uv.h"
@@ -311,7 +312,10 @@ void FileWatcher::NotifyEvent(const struct inotify_event *event, WatcherCallback
             continue;
         }
         if (event->len > 0) {
-            fileName += "/" + string(event->name);
+            std::filesystem::path base = fileName;
+            std::filesystem::path file = string(event->name);
+            fileName = base / file;
+
         }
         callback(iter->env, iter->nRef, fileName, event->mask & IN_ALL_EVENTS, event->cookie);
     }
-- 
Gitee


From bdd8a68ae6edaa1703fb9a2e90a8a2fae9e2df2b Mon Sep 17 00:00:00 2001
From: tianp <tianpeng35@huawei.com>
Date: Sat, 8 Feb 2025 02:10:07 +0000
Subject: [PATCH 2/2] update
 interfaces/kits/js/src/mod_fs/class_watcher/watcher_entity.cpp.

Signed-off-by: tianp <tianpeng35@huawei.com>
---
 interfaces/kits/js/src/mod_fs/class_watcher/watcher_entity.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/interfaces/kits/js/src/mod_fs/class_watcher/watcher_entity.cpp b/interfaces/kits/js/src/mod_fs/class_watcher/watcher_entity.cpp
index ef1a6b527..4a336e961 100644
--- a/interfaces/kits/js/src/mod_fs/class_watcher/watcher_entity.cpp
+++ b/interfaces/kits/js/src/mod_fs/class_watcher/watcher_entity.cpp
@@ -315,7 +315,6 @@ void FileWatcher::NotifyEvent(const struct inotify_event *event, WatcherCallback
             std::filesystem::path base = fileName;
             std::filesystem::path file = string(event->name);
             fileName = base / file;
-
         }
         callback(iter->env, iter->nRef, fileName, event->mask & IN_ALL_EVENTS, event->cookie);
     }
-- 
Gitee