From da1f603e64d9c459ddf84e8b7ed9bae4b607526c Mon Sep 17 00:00:00 2001
From: stesen <stesen.ma@huawei.com>
Date: Thu, 29 Jul 2021 12:03:48 +0800
Subject: [PATCH] adapte for musl

Signed-off-by: stesen <stesen.ma@huawei.com>
Change-Id: Ie897588888dc2b1938a04200d950a82f6d365bd8
---
 services/hilogd/etc/BUILD.gn          | 10 +++++++---
 services/hilogd/etc/hilogd.cfg        | 25 +++++++++++++++++++++++++
 services/hilogtool/log_controller.cpp |  5 +++--
 services/hilogtool/main.cpp           |  5 +++--
 4 files changed, 38 insertions(+), 7 deletions(-)
 create mode 100644 services/hilogd/etc/hilogd.cfg

diff --git a/services/hilogd/etc/BUILD.gn b/services/hilogd/etc/BUILD.gn
index 4108d21..ee5250d 100644
--- a/services/hilogd/etc/BUILD.gn
+++ b/services/hilogd/etc/BUILD.gn
@@ -16,7 +16,7 @@ import("//build/ohos.gni")
 group("hilogd_etc") {
   deps = [
     ":hilog_domains.conf",
-    ":hilogd.rc",
+    ":hilogd.cfg",
   ]
 }
 
@@ -26,8 +26,12 @@ ohos_prebuilt_etc("hilog_domains.conf") {
   subsystem_name = "hiviewdfx"
 }
 
-ohos_prebuilt_etc("hilogd.rc") {
-  source = "hilogd.rc"
+ohos_prebuilt_etc("hilogd.cfg") {
+  if (use_musl) {
+    source = "hilogd.cfg"
+  } else {
+    source = "hilogd.rc"
+  }
   relative_install_dir = "init"
   part_name = "hilog_service"
   subsystem_name = "hiviewdfx"
diff --git a/services/hilogd/etc/hilogd.cfg b/services/hilogd/etc/hilogd.cfg
new file mode 100644
index 0000000..9436429
--- /dev/null
+++ b/services/hilogd/etc/hilogd.cfg
@@ -0,0 +1,25 @@
+{
+    "jobs" : [{
+            "name" : "pre-init",
+            "cmds" : [
+                "write /proc/sys/net/unix/max_dgram_qlen 600"
+            ]
+        }, {
+            "name" : "post-fs-data",
+            "cmds" : [
+                "start hilogd"
+            ]
+        }
+    ],
+    "services" : [{
+            "name" : "hilogd",
+            "path" : ["/system/bin/hilogd"],
+            "disabled" : 1,
+            "uid" : "logd",
+            "socket" : [
+                "hilogInput dgram 0666 logd logd passcred",
+                "hilogControl seqpacket 0600 logd logd false"
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/services/hilogtool/log_controller.cpp b/services/hilogtool/log_controller.cpp
index eb585a9..b898949 100644
--- a/services/hilogtool/log_controller.cpp
+++ b/services/hilogtool/log_controller.cpp
@@ -21,7 +21,7 @@
 #include <string>
 #include <vector>
 #include <securec.h>
-#include <error.h>
+#include <stdio.h>
 
 #include "hilog/log.h"
 #include "hilog_common.h"
@@ -212,7 +212,8 @@ void LogQueryResponseOp(SeqPacketSocketClient& controller, char* recvBuffer, uin
     while(1) {
         memset_s(recvBuffer, bufLen, 0, bufLen);
         if (controller.RecvMsg(recvBuffer, bufLen) == 0) {
-            error(EXIT_FAILURE, 0, "Unexpected EOF");
+            fprintf(stderr, "Unexpected EOF %s\n", strerror(errno));
+            exit(1);
             return;
         }
         MessageHeader* msgHeader = &(rsp->header);
diff --git a/services/hilogtool/main.cpp b/services/hilogtool/main.cpp
index 39de63e..774c62f 100644
--- a/services/hilogtool/main.cpp
+++ b/services/hilogtool/main.cpp
@@ -21,9 +21,9 @@
 #include <iomanip>
 #include <string>
 #include <vector>
+#include <stdio.h>
 #include <sstream>
 #include <regex>
-#include <error.h>
 #include <securec.h>
 
 #include "hilog/log.h"
@@ -558,7 +558,8 @@ int HilogEntry(int argc, char* argv[])
 
     memset_s(recvBuffer, sizeof(recvBuffer), 0, sizeof(recvBuffer));
     if (controller.RecvMsg(recvBuffer, RECV_BUF_LEN) == 0) {
-            error(EXIT_FAILURE, 0, "Unexpected EOF");
+            fprintf(stderr, "Unexpected EOF %s\n", strerror(errno));
+            exit(1);
             return 0;
     }
 
-- 
Gitee