From ebfe310e95de39e6cdcbd4cd61a26e3eba0845ab Mon Sep 17 00:00:00 2001
From: sun_fan <sun_fan1@hoperun.com>
Date: Tue, 28 Sep 2021 14:16:49 +0800
Subject: [PATCH] init: fix codedex

Signed-off-by: sun_fan <sun_fan1@hoperun.com>
---
 interfaces/innerkits/dynamic_service/dynamic_service.c | 4 ++--
 interfaces/innerkits/reboot/init_reboot.c              | 2 +-
 services/cmds/reboot/init_cmd_reboot.c                 | 4 +++-
 services/cmds/service_control/service_control.c        | 4 +++-
 services/log/init_log.c                                | 2 +-
 services/src/init_cmds.c                               | 5 ++---
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/interfaces/innerkits/dynamic_service/dynamic_service.c b/interfaces/innerkits/dynamic_service/dynamic_service.c
index db4a8c0..ada23dc 100755
--- a/interfaces/innerkits/dynamic_service/dynamic_service.c
+++ b/interfaces/innerkits/dynamic_service/dynamic_service.c
@@ -31,7 +31,7 @@ int32_t StartDynamicProcess(const char *name)
         return -1;
     }
     if (SetParameter("ohos.ctl.start", name) != 0) {
-        HILOG_ERROR(LOG_CORE, "Set param for %{public}s failed.\n", name);
+        HILOG_ERROR(LOG_CORE, "Set param for {public}%s failed.\n", name);
         return -1;
     }
     return 0;
@@ -44,7 +44,7 @@ int32_t StopDynamicProcess(const char *name)
         return -1;
     }
     if (SetParameter("ohos.ctl.stop", name) != 0) {
-        HILOG_ERROR(LOG_CORE, "Set param for %{public}s failed.\n", name);
+        HILOG_ERROR(LOG_CORE, "Set param for {public}%s failed.\n", name);
         return -1;
     }
     return 0;
diff --git a/interfaces/innerkits/reboot/init_reboot.c b/interfaces/innerkits/reboot/init_reboot.c
index 31cc6ca..bbbab36 100644
--- a/interfaces/innerkits/reboot/init_reboot.c
+++ b/interfaces/innerkits/reboot/init_reboot.c
@@ -45,7 +45,7 @@ int DoReboot(const char *option)
         }
         return 0;
     }
-    int length = strlen(option);
+    size_t length = strlen(option);
     if (length > MAX_REBOOT_OPTION_SIZE) {
         INIT_LOGE("Reboot option \" %s \" is too large, overflow", option);
         return -1;
diff --git a/services/cmds/reboot/init_cmd_reboot.c b/services/cmds/reboot/init_cmd_reboot.c
index 528a9d3..314da47 100644
--- a/services/cmds/reboot/init_cmd_reboot.c
+++ b/services/cmds/reboot/init_cmd_reboot.c
@@ -32,7 +32,9 @@ int main(int argc, char* argv[])
         printf("%s", USAGE_INFO);
         return 0;
     }
-
+    if (argv[1] == NULL) {
+        return -1;
+    }
     if (argc == REBOOT_CMD_NUMBER && strcmp(argv[1], "shutdown") != 0 &&
         strcmp(argv[1], "updater") != 0 &&
         strcmp(argv[1], "flash") != 0 &&
diff --git a/services/cmds/service_control/service_control.c b/services/cmds/service_control/service_control.c
index 320e155..c000c28 100755
--- a/services/cmds/service_control/service_control.c
+++ b/services/cmds/service_control/service_control.c
@@ -67,7 +67,9 @@ int main(int argc, char** argv)
         ServiceControlUsage();
         return -1;
     }
-
+    if (argv[0] == NULL) {
+        return -1;
+    }
     char serviceCtl[SERVICE_CONTROL_MAX_SIZE];
     if (strcmp(argv[0], "start_service") == 0) {
         if (strncpy_s(serviceCtl, sizeof(serviceCtl), "ohos.ctl.start", sizeof(serviceCtl) - 1) != EOK) {
diff --git a/services/log/init_log.c b/services/log/init_log.c
index 5a14576..25e3f07 100644
--- a/services/log/init_log.c
+++ b/services/log/init_log.c
@@ -83,7 +83,7 @@ void EnableDevKmsg(void)
     if (fd < 0) {
         return;
     }
-    char *kmsgStatus = "on";
+    const char *kmsgStatus = "on";
     write(fd, kmsgStatus, strlen(kmsgStatus) + 1);
     close(fd);
     fd = -1;
diff --git a/services/src/init_cmds.c b/services/src/init_cmds.c
index a3c962c..4b33386 100644
--- a/services/src/init_cmds.c
+++ b/services/src/init_cmds.c
@@ -230,7 +230,7 @@ static void WriteCommon(const char *file, char *buffer, int flags, mode_t mode)
             size_t totalSize = strlen(buffer);
             size_t written = WriteAll(fd, buffer, totalSize);
             if (written != totalSize) {
-                INIT_LOGE("Write %lu bytes to file failed", totalSize, file);
+                INIT_LOGE("Write %lu bytes to file %s failed", totalSize, file);
             }
             close(fd);
         }
@@ -389,8 +389,6 @@ static void DoCopyInernal(const char *source, const char *target)
     int srcFd = open(source, O_RDONLY | O_CLOEXEC, S_IRUSR | S_IWUSR);
     if (srcFd < 0) {
         INIT_LOGE("Open \" %s \" failed, err = %d", source, errno);
-        close(srcFd);
-        srcFd = -1;
         return;
     }
 
@@ -1155,6 +1153,7 @@ static void DoMakeDevice(const char *cmdContent, int maxArg)
     unsigned int major = strtoul(ctx->argv[0], NULL, DECIMAL_BASE);
     unsigned int minor = strtoul(ctx->argv[1], NULL, DECIMAL_BASE);
     if (major == 0 || minor == 0) {
+        FreeCmd(ctx);
         return;
     }
     dev_t deviceId = makedev(major, minor);