!1443 把fsmanager从libbegetutil.z.so中移出

Merge pull request !1443 from handy/1028

bundle.json

@@ -73,7 +73,6 @@
                         "header_files": [
                             "init_socket.h",
                             "init_file.h",
-                            "fs_manager/fs_manager.h",
                             "init_reboot.h",
                             "service_control.h",
                             "beget_ext.h",
@@ -87,6 +86,15 @@
                     },
                     "name": "//base/startup/init/interfaces/innerkits:libbegetutil"
                 },
+                {
+                    "header": {
+                        "header_base": "//base/startup/init/interfaces/innerkits/include/fs_manager/",
+                        "header_files": [
+                            "fs_manager.h"
+                        ]
+                    },
+                    "name": "//base/startup/init/interfaces/innerkits/fs_manager:libfsmanager_static"
+                },
                 {
                     "header": {
                         "header_base": "//base/startup/init/interfaces/innerkits/include/",

interfaces/innerkits/BUILD.gn

@@ -25,7 +25,6 @@ config("exported_header_files") {
   include_dirs = [
     "//base/startup/init/interfaces/innerkits/include",
     "//base/startup/init/interfaces/innerkits/include/syspara",
-    "//base/startup/init/interfaces/innerkits/include/fs_manager",
     "//base/startup/init/interfaces/innerkits/include/token",
     "//base/startup/init/services/include",
   ]
@@ -177,7 +176,6 @@ if (defined(ohos_lite)) {
       "//base/startup/init/interfaces/innerkits/control_fd:libcontrolfd",
       "//base/startup/init/interfaces/innerkits/fd_holder:fdholder",
       "//base/startup/init/interfaces/innerkits/file:libfile",
-      "//base/startup/init/interfaces/innerkits/fs_manager:libfsmanager_static",
       "//base/startup/init/interfaces/innerkits/socket:libsocket",
       "//base/startup/init/services/log:agent_log",
       "//base/startup/init/services/loopevent:loopevent",

services/begetctl/misc_daemon.cpp

@@ -35,15 +35,7 @@ constexpr int PARTITION_INFO_MAX_LENGTH = 256;
 constexpr int BLOCK_SZIE_1 = 512;
 constexpr uint64_t LOGO_MAGIC = 0XABCABCAB;
 
-static std::string GetMiscDevicePath()
-{
-    char miscDevice[PATH_MAX] = {0};
-    int ret = GetBlockDevicePath("/misc", miscDevice, PATH_MAX);
-    if (ret != 0) {
-        return std::string("");
-    }
-    return std::string(miscDevice);
-}
+#define MISC_DEVICE_NODE "/dev/block/by-name/misc"
 
 static void ClearLogo(int fd)
 {
@@ -162,28 +154,23 @@ static void WriteLogoToMisc(const std::string &logoPath)
         std::cout << "logo path is empty\n";
         return;
     }
-    std::string miscDev = GetMiscDevicePath();
-    if (miscDev.empty()) {
-        return;
-    }
-    BSH_LOGI("WriteLogoToMisc miscDev %s ", miscDev.c_str());
-    int fd = open(miscDev.c_str(), O_RDWR | O_CLOEXEC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+    int fd = open(MISC_DEVICE_NODE, O_RDWR | O_CLOEXEC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
     if (fd < 0) {
-        BSH_LOGI("Failed to writeLogoToMisc miscDev %s errno %d ", miscDev.c_str(), errno);
+        BSH_LOGI("Failed to writeLogoToMisc errno %d ", errno);
         return;
     }
 
     if (WriteLogo(fd, logoPath) < 0) {
-        BSH_LOGI("Failed WriteLogo miscDev %s errno %d ", miscDev.c_str(), errno);
+        BSH_LOGI("Failed WriteLogo errno %d ", errno);
     }
     close(fd);
     int addrOffset = (PARTITION_INFO_POS + PARTITION_INFO_MAX_LENGTH + BLOCK_SZIE_1 - 1) / BLOCK_SZIE_1;
-    int fd1 = open(miscDev.c_str(), O_RDWR | O_CLOEXEC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+    int fd1 = open(MISC_DEVICE_NODE, O_RDWR | O_CLOEXEC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
     if (fd1 < 0) {
         return;
     }
     if (lseek(fd1, addrOffset * BLOCK_SZIE_1, SEEK_SET) < 0) {
-        BSH_LOGI("Failed lseek miscDev %s errno %d ", miscDev.c_str(), errno);
+        BSH_LOGI("Failed lseek errno %d ", errno);
         close(fd1);
         return;
     }
@@ -191,12 +178,12 @@ static void WriteLogoToMisc(const std::string &logoPath)
     uint32_t magic = 0;
     uint32_t size = 0;
     if (read(fd1, &magic, sizeof(uint32_t)) != sizeof(uint32_t)) {
-        BSH_LOGI("Failed read miscDev %s errno %d ", miscDev.c_str(), errno);
+        BSH_LOGI("Failed read errno %d ", errno);
         close(fd1);
         return;
     }
     if (read(fd1, &size, sizeof(uint32_t)) != sizeof(uint32_t)) {
-        BSH_LOGI("Failed read migic miscDev %s errno %d ", miscDev.c_str(), errno);
+        BSH_LOGI("Failed read migic errno %d ", errno);
         close(fd1);
         return;
     }

test/fuzztest/BUILD.gn

@@ -115,6 +115,7 @@ ohos_fuzztest("MountAllFstabFuzzTest") {
 
   deps = [
     "//base/startup/init/interfaces/innerkits:libbegetutil",
+    "//base/startup/init/interfaces/innerkits/fs_manager:libfsmanager_static",
     "//base/startup/init/test/fuzztest:libfuzz_utils",
     "//third_party/bounds_checking_function:libsec_static",
   ]
@@ -501,6 +502,7 @@ ohos_fuzztest("UmountAllFstabFuzzTest") {
 
   deps = [
     "//base/startup/init/interfaces/innerkits:libbegetutil",
+    "//base/startup/init/interfaces/innerkits/fs_manager:libfsmanager_static",
     "//base/startup/init/test/fuzztest:libfuzz_utils",
     "//third_party/bounds_checking_function:libsec_static",
   ]