fix: inner source issue

Signed-off-by: xionglei6 <xionglei6@huawei.com>
2025-02-17 02:29:23 +00:00 · 2022-03-29 11:53:13 +08:00 · 2022-03-29 11:53:13 +08:00 · 1259247a28
commit 1259247a28
parent e322c43e5c
38 changed files with 50 additions and 63 deletions
--- a/BUILD.gn
+++ b/BUILD.gn
@ -1,4 +1,4 @@
-# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2022 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
--- a/OAT.xml
+++ b/OAT.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2021 Huawei Device Co., Ltd.
+<!-- Copyright (c) 2022 Huawei Device Co., Ltd.

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
--- a/README.md
+++ b/README.md
@ -23,15 +23,4 @@ base/startup/appspawn_standard

 Startup subsystem

-hmf/startup/syspara\_lite
-
-**hmf/startup/appspawn_standard**
-
-hmf/startup/appspawn\_lite
-
-hmf/startup/bootstrap\_lite
-
-hmf/startup/startup
-
-hmf/startup/systemrestore
-
+**[appspawn_standard](https://gitee.com/openharmony/startup_appspawn/blob/master/README.md)**
--- a/README_zh.md
+++ b/README_zh.md
@ -27,5 +27,4 @@ base/startup/appspawn_standard

 appspawn应用孵化器组件

-**startup_appspawn**
-
+**[startup_appspawn](https://gitee.com/openharmony/startup_appspawn/blob/master/README_zh.md)**
--- a/appspawn.gni
+++ b/appspawn.gni
@ -1,4 +1,4 @@
-# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2022 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
--- a/appspawn.rc
+++ b/appspawn.rc
@ -1,4 +1,4 @@
-# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2022 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
--- a/interfaces/innerkits/BUILD.gn
+++ b/interfaces/innerkits/BUILD.gn
@ -1,4 +1,4 @@
-# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2022 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
--- a/interfaces/innerkits/include/appspawn_socket.h
+++ b/interfaces/innerkits/include/appspawn_socket.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/interfaces/innerkits/include/client_socket.h
+++ b/interfaces/innerkits/include/client_socket.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/src/appspawn_msg_peer.cpp
+++ b/src/appspawn_msg_peer.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/src/appspawn_server.cpp
+++ b/src/appspawn_server.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
@ -486,7 +486,7 @@ int32_t AppSpawnServer::SetProcessName(
    }

    // process short name max length 16 bytes.
-    if (len > MAX_LEN_SHORT_NAME) {
+    if (len >= MAX_LEN_SHORT_NAME) {
        if (strncpy_s(shortName, MAX_LEN_SHORT_NAME, processName, MAX_LEN_SHORT_NAME - 1) != EOK) {
            HiLog::Error(LABEL, "strncpy_s short name error: %{public}d", errno);
            return -EINVAL;
@ -1013,9 +1013,7 @@ bool AppSpawnServer::SetAppProcProperty(const ClientSocket::AppProperty *appProp
 #else
    AppExecFwk::MainThread::Start();
 #endif
-
-    HiLog::Error(LABEL, "Failed to start process, pid = %{public}d", getpid());
-    return false;
+    return true;
 }

 void AppSpawnServer::NotifyResToParentProc(const int32_t fd, const int32_t value)
--- a/src/include/appspawn_msg_peer.h
+++ b/src/include/appspawn_msg_peer.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/src/include/appspawn_server.h
+++ b/src/include/appspawn_server.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
@ -72,6 +72,7 @@ public:

    int AppColdStart(char *longProcName,
        int64_t longProcNameLen, const ClientSocket::AppProperty *appProperty, int fd);
+
 private:
    int DoColdStartApp(ClientSocket::AppProperty *appProperty, int fd);

@ -195,6 +196,7 @@ private:
    void HandleSignal();

    void QuickExitMain();
+
 private:
    const std::string deviceNull_ = "/dev/null";
    std::string socketName_ {};
--- a/src/include/server_socket.h
+++ b/src/include/server_socket.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/src/main.cpp
+++ b/src/main.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/src/socket/appspawn_socket.cpp
+++ b/src/socket/appspawn_socket.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/src/socket/client_socket.cpp
+++ b/src/socket/client_socket.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/src/socket/server_socket.cpp
+++ b/src/socket/server_socket.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@ -1,4 +1,4 @@
-# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2022 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
--- a/test/mock/include/main_thread.h
+++ b/test/mock/include/main_thread.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/test/mock/include/mock_client_socket.h
+++ b/test/mock/include/mock_client_socket.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/test/mock/include/mock_server_socket.h
+++ b/test/mock/include/mock_server_socket.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/test/mock/src/appspawn_msg_peer.cpp
+++ b/test/mock/src/appspawn_msg_peer.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/test/mock/src/main_thread.cpp
+++ b/test/mock/src/main_thread.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/test/mock/src/server_socket.cpp
+++ b/test/mock/src/server_socket.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/test/moduletest/BUILD.gn
+++ b/test/moduletest/BUILD.gn
@ -1,4 +1,4 @@
-# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2022 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
--- a/test/moduletest/appspawn_module_test.cpp
+++ b/test/moduletest/appspawn_module_test.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
@ -72,11 +72,11 @@ bool readFileInfo(char *buffer, const int32_t &pid, const char *fileName)
    // Set file path
    char filePath[FILE_PATH_SIZE];
    if (sprintf_s(filePath, sizeof(filePath), "/proc/%d/%s", pid, fileName) <= 0) {
-        HiLog::Error(LABEL, "filePath sprintf_s fail .");
+        HiLog::Error(LABEL, "filePath sprintf_s failed.");
        return CHECK_ERROR;
    }
    if (!checkFileIsExists(filePath)) {
-        HiLog::Error(LABEL, "file %{public}s is not exists .", fileName);
+        HiLog::Error(LABEL, "file %{public}s not exists.", fileName);
        return CHECK_ERROR;
    }
    // Open file
@ -207,7 +207,7 @@ bool checkProcName(const int32_t &pid, const AppSpawnStartMsg &params)
    FILE *fp = nullptr;
    char cmd[CMD_SIZE];
    if (sprintf_s(cmd, sizeof(cmd), "ps -o ARGS=CMD -p %d |grep -v CMD", pid) <= 0) {
-        HiLog::Error(LABEL, "cmd sprintf_s fail .");
+        HiLog::Error(LABEL, "cmd sprintf_s failed.");
        return CHECK_ERROR;
    }
    if(strlen(cmd) > CMD_SIZE) {
@ -246,12 +246,12 @@ bool checkProcessIsDestroyed(const int32_t &pid)
 {
    char filePath[FILE_PATH_SIZE];
    if (sprintf_s(filePath, sizeof(filePath), "/proc/%d", pid) <= 0) {
-        HiLog::Error(LABEL, "filePath sprintf_s fail .");
+        HiLog::Error(LABEL, "filePath sprintf_s failed.");
        return CHECK_ERROR;
    }

    if (checkFileIsExists(filePath)) {
-        HiLog::Error(LABEL, "File %{public}d is not exists .", pid);
+        HiLog::Error(LABEL, "File %{public}d not exists.", pid);
        return CHECK_ERROR;
    }

@ -332,8 +332,7 @@ void AppSpawnModuleTest::TearDownTestCase()
 void AppSpawnModuleTest::SetUp()
 {
    newPid = 0;
-    auto ret = memset_s(buffer, sizeof(buffer), 0x00, BUFFER_SIZE);
-    if (ret != EOK) {
+    if (memset_s(buffer, sizeof(buffer), 0x00, BUFFER_SIZE) != EOK) {
        HiLog::Error(LABEL, "memset_s is failed.");
    }
 }
@ -366,7 +365,7 @@ HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_listen_001, TestSize.Level0)
 * FunctionPoints: Process start message monitoring.
 * EnvConditions: AppSpawn main process has started.
 *                The socket server has been established.
- * CaseDescription: 1. Establish a socket client and connect with the Appspawn server
+ * CaseDescription: 1. Establish a socket client and connect with the AppSpawn server
 */
 HWTEST_F(AppSpawnModuleTest, AppSpawn_HF_listen_002, TestSize.Level0)
 {
--- a/test/unittest/app_spawn_msg_peer_test/BUILD.gn
+++ b/test/unittest/app_spawn_msg_peer_test/BUILD.gn
@ -1,4 +1,4 @@
-# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2022 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
--- a/test/unittest/app_spawn_msg_peer_test/app_spawn_msg_peer_test.cpp
+++ b/test/unittest/app_spawn_msg_peer_test/app_spawn_msg_peer_test.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/test/unittest/app_spawn_server_test/BUILD.gn
+++ b/test/unittest/app_spawn_server_test/BUILD.gn
@ -1,4 +1,4 @@
-# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2022 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
--- a/test/unittest/app_spawn_server_test/app_spawn_server_mock_test.cpp
+++ b/test/unittest/app_spawn_server_test/app_spawn_server_mock_test.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/test/unittest/app_spawn_server_test/app_spawn_server_override_test.cpp
+++ b/test/unittest/app_spawn_server_test/app_spawn_server_override_test.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
@ -216,4 +216,4 @@ HWTEST_F(AppSpawnServerOverrideTest, App_Spawn_Server_Override_007, TestSize.Lev
    EXPECT_EQ(0, appSpawnServer_->SetProcessName(longProcName, longProcNameLen, processName, len));

    GTEST_LOG_(INFO) << "App_Spawn_Server_Override_007 end";
-}
+}
--- a/test/unittest/app_spawn_socket_test/BUILD.gn
+++ b/test/unittest/app_spawn_socket_test/BUILD.gn
@ -1,4 +1,4 @@
-# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2022 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
--- a/test/unittest/app_spawn_socket_test/app_spawn_socket_test.cpp
+++ b/test/unittest/app_spawn_socket_test/app_spawn_socket_test.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/test/unittest/client_socket_test/BUILD.gn
+++ b/test/unittest/client_socket_test/BUILD.gn
@ -1,4 +1,4 @@
-# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2022 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
--- a/test/unittest/client_socket_test/client_socket_test.cpp
+++ b/test/unittest/client_socket_test/client_socket_test.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/test/unittest/server_socket_test/BUILD.gn
+++ b/test/unittest/server_socket_test/BUILD.gn
@ -1,4 +1,4 @@
-# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2022 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
--- a/test/unittest/server_socket_test/server_socket_test.cpp
+++ b/test/unittest/server_socket_test/server_socket_test.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at