diff --git a/License/LICENSE b/License/LICENSE index cefc2d2ab245d76fe75ccfa23d5b6fe3693a83c1..f74a5d48523466f0ea5dcc92e40ab109f7514ffa 100644 --- a/License/LICENSE +++ b/License/LICENSE @@ -1,21 +1,22 @@ - 木兰宽松许可证, 第1版 + 木兰宽松许可证, 第2版 - 木兰宽松许可证, 第1版 - 2019年8月 http://license.coscl.org.cn/MulanPSL + 木兰宽松许可证, 第2版 + 2020年1月 http://license.coscl.org.cn/MulanPSL22 - 您对“软件”的复制、使用、修改及分发受木兰宽松许可证,第1版(“本许可证”)的如下条款的约束: + + 您对“软件”的复制、使用、修改及分发受木兰宽松许可证,第2版(“本许可证”)的如下条款的约束: 0. 定义 “软件”是指由“贡献”构成的许可在“本许可证”下的程序和相关文档的集合。 + “贡献”是指由任一“贡献者”许可在“本许可证”下的受版权法保护的作品。 + “贡献者”是指将受版权法保护的作品许可在“本许可证”下的自然人或“法人实体”。 “法人实体”是指提交贡献的机构及其“关联实体”。 - “关联实体”是指,对“本许可证”下的一方而言,控制、受控制或与其共同受控制的机构,此处的控制是指有受控方或共同受控方至少50%直接或间接的投票权、资金或其他有价证券。 - - “贡献”是指由任一“贡献者”许可在“本许可证”下的受版权法保护的作品。 + “关联实体”是指,对“本许可证”下的行为方而言,控制、受控制或与其共同受控制的机构,此处的控制是指有受控方或共同受控方至少50%直接或间接的投票权、资金或其他有价证券。 1. 授予版权许可 @@ -23,7 +24,7 @@ 2. 授予专利许可 - 每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的(根据本条规定撤销除外)专利许可,供您制造、委托制造、使用、许诺销售、销售、进口其“贡献”或以其他方式转移其“贡献”。前述专利许可仅限于“贡献者”现在或将来拥有或控制的其“贡献”本身或其“贡献”与许可“贡献”时的“软件”结合而将必然会侵犯的专利权利要求,不包括仅因您或他人修改“贡献”或其他结合而将必然会侵犯到的专利权利要求。如您或您的“关联实体”直接或间接地(包括通过代理、专利被许可人或受让人),就“软件”或其中的“贡献”对任何人发起专利侵权诉讼(包括反诉或交叉诉讼)或其他专利维权行动,指控其侵犯专利权,则“本许可证”授予您对“软件”的专利许可自您提起诉讼或发起维权行动之日终止。 + 每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的(根据本条规定撤销除外)专利许可,供您制造、委托制造、使用、许诺销售、销售、进口其“贡献”或以其他方式转移其“贡献”。前述专利许可仅限于“贡献者”现在或将来拥有或控制的其“贡献”本身或其“贡献”与许可“贡献”时的“软件”结合而将必然会侵犯的专利权利要求,不包括对“贡献”的修改或包含“贡献”的其他结合。如果您或您的“关联实体”直接或间接地,就“软件”或其中的“贡献”对任何人发起专利侵权诉讼(包括反诉或交叉诉讼)或其他专利维权行动,指控其侵犯专利权,则“本许可证”授予您对“软件”的专利许可自您提起诉讼或发起维权行动之日终止。 3. 无商标许可 @@ -35,13 +36,16 @@ 5. 免责声明与责任限制 - “软件”及其中的“贡献”在提供时不带任何明示或默示的担保。在任何情况下,“贡献者”或版权所有者不对任何人因使用“软件”或其中的“贡献”而引发的任何直接或间接损失承担责任,不论因何种原因导致或者基于何种法律理论,即使其曾被建议有此种损失的可能性。 + “软件”及其中的“贡献”在提供时不带任何明示或默示的担保。在任何情况下,“贡献者”或版权所有者不对任何人因使用“软件”或其中的“贡献”而引发的任何直接或间接损失承担责任,不论因何种原因导致或者基于何种法律理论,即使其曾被建议有此种损失的可能性。 - 条款结束。 + 6. 语言 + “本许可证”以中英文双语表述,中英文版本具有同等法律效力。如果中英文版本存在任何冲突不一致,以中文版为准。 - 如何将木兰宽松许可证,第1版,应用到您的软件 + 条款结束 - 如果您希望将木兰宽松许可证,第1版,应用到您的新软件,为了方便接收者查阅,建议您完成如下三步: + 如何将木兰宽松许可证,第2版,应用到您的软件 + + 如果您希望将木兰宽松许可证,第2版,应用到您的新软件,为了方便接收者查阅,建议您完成如下三步: 1, 请您补充如下声明中的空白,包括软件名、软件的首次发表年份以及您作为版权人的名字; @@ -49,47 +53,45 @@ 3, 请将如下声明文本放入每个源文件的头部注释中。 - Copyright (c) [2019] [name of copyright holder] - [Software Name] is licensed under the Mulan PSL v1. - You can use this software according to the terms and conditions of the Mulan PSL v1. - You may obtain a copy of Mulan PSL v1 at: - http://license.coscl.org.cn/MulanPSL - THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR - PURPOSE. - See the Mulan PSL v1 for more details. - + Copyright (c) [Year] [name of copyright holder] + [Software Name] is licensed under Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL22 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. - Mulan Permissive Software License,Version 1 - Mulan Permissive Software License,Version 1 (Mulan PSL v1) - August 2019 http://license.coscl.org.cn/MulanPSL + Mulan Permissive Software License,Version 2 - Your reproduction, use, modification and distribution of the Software shall be subject to Mulan PSL v1 (this License) with following terms and conditions: + Mulan Permissive Software License,Version 2 (Mulan PSL v2) + January 2020 http://license.coscl.org.cn/MulanPSL22 + Your reproduction, use, modification and distribution of the Software shall be subject to Mulan PSL v2 (this License) with the following terms and conditions: + 0. Definition - - Software means the program and related documents which are comprised of those Contribution and licensed under this License. - + + Software means the program and related documents which are licensed under this License and comprise all Contribution(s). + + Contribution means the copyrightable work licensed by a particular Contributor under this License. + Contributor means the Individual or Legal Entity who licenses its copyrightable work under this License. - + Legal Entity means the entity making a Contribution and all its Affiliates. - - Affiliates means entities that control, or are controlled by, or are under common control with a party to this License, ‘control’ means direct or indirect ownership of at least fifty percent (50%) of the voting power, capital or other securities of controlled or commonly controlled entity. - - Contribution means the copyrightable work licensed by a particular Contributor under this License. + + Affiliates means entities that control, are controlled by, or are under common control with the acting entity under this License, ‘control’ means direct or indirect ownership of at least fifty percent (50%) of the voting power, capital or other securities of controlled or commonly controlled entity. 1. Grant of Copyright License Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable copyright license to reproduce, use, modify, or distribute its Contribution, with modification or not. - 2. Grant of Patent License + 2. Grant of Patent License - Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable (except for revocation under this Section) patent license to make, have made, use, offer for sale, sell, import or otherwise transfer its Contribution where such patent license is only limited to the patent claims owned or controlled by such Contributor now or in future which will be necessarily infringed by its Contribution alone, or by combination of the Contribution with the Software to which the Contribution was contributed, excluding of any patent claims solely be infringed by your or others’ modification or other combinations. If you or your Affiliates directly or indirectly (including through an agent, patent licensee or assignee), institute patent litigation (including a cross claim or counterclaim in a litigation) or other patent enforcement activities against any individual or entity by alleging that the Software or any Contribution in it infringes patents, then any patent license granted to you under this License for the Software shall terminate as of the date such litigation or activity is filed or taken. + Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable (except for revocation under this Section) patent license to make, have made, use, offer for sale, sell, import or otherwise transfer its Contribution, where such patent license is only limited to the patent claims owned or controlled by such Contributor now or in future which will be necessarily infringed by its Contribution alone, or by combination of the Contribution with the Software to which the Contribution was contributed. The patent license shall not apply to any modification of the Contribution, and any other combination which includes the Contribution. If you or your Affiliates directly or indirectly institute patent litigation (including a cross claim or counterclaim in a litigation) or other patent enforcement activities against any individual or entity by alleging that the Software or any Contribution in it infringes patents, then any patent license granted to you under this License for the Software shall terminate as of the date such litigation or activity is filed or taken. 3. No Trademark License - No trademark license is granted to use the trade names, trademarks, service marks, or product names of Contributor, except as required to fulfill notice requirements in section 4. + No trademark license is granted to use the trade names, trademarks, service marks, or product names of Contributor, except as required to fulfill notice requirements in Section 4. 4. Distribution Restriction @@ -97,25 +99,29 @@ 5. Disclaimer of Warranty and Limitation of Liability - The Software and Contribution in it are provided without warranties of any kind, either express or implied. In no event shall any Contributor or copyright holder be liable to you for any damages, including, but not limited to any direct, or indirect, special or consequential damages arising from your use or inability to use the Software or the Contribution in it, no matter how it’s caused or based on which legal theory, even if advised of the possibility of such damages. + THE SOFTWARE AND CONTRIBUTION IN IT ARE PROVIDED WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED. IN NO EVENT SHALL ANY CONTRIBUTOR OR COPYRIGHT HOLDER BE LIABLE TO YOU FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO ANY DIRECT, OR INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING FROM YOUR USE OR INABILITY TO USE THE SOFTWARE OR THE CONTRIBUTION IN IT, NO MATTER HOW IT’S CAUSED OR BASED ON WHICH LEGAL THEORY, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - End of the Terms and Conditions + 6. Language - How to apply the Mulan Permissive Software License,Version 1 (Mulan PSL v1) to your software + THIS LICENSE IS WRITTEN IN BOTH CHINESE AND ENGLISH, AND THE CHINESE VERSION AND ENGLISH VERSION SHALL HAVE THE SAME LEGAL EFFECT. IN THE CASE OF DIVERGENCE BETWEEN THE CHINESE AND ENGLISH VERSIONS, THE CHINESE VERSION SHALL PREVAIL. - To apply the Mulan PSL v1 to your work, for easy identification by recipients, you are suggested to complete following three steps: + END OF THE TERMS AND CONDITIONS - i. Fill in the blanks in following statement, including insert your software name, the year of the first publication of your software, and your name identified as the copyright owner; - ii. Create a file named “LICENSE” which contains the whole context of this License in the first directory of your software package; - iii. Attach the statement to the appropriate annotated syntax at the beginning of each source file. - - Copyright (c) [2019] [name of copyright holder] - [Software Name] is licensed under the Mulan PSL v1. - You can use this software according to the terms and conditions of the Mulan PSL v1. - You may obtain a copy of Mulan PSL v1 at: - http://license.coscl.org.cn/MulanPSL - THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR - PURPOSE. - - See the Mulan PSL v1 for more details. + How to Apply the Mulan Permissive Software License,Version 2 (Mulan PSL v2) to Your Software + + To apply the Mulan PSL v2 to your work, for easy identification by recipients, you are suggested to complete following three steps: + + i Fill in the blanks in following statement, including insert your software name, the year of the first publication of your software, and your name identified as the copyright owner; + + ii Create a file named “LICENSE” which contains the whole context of this License in the first directory of your software package; + + iii Attach the statement to the appropriate annotated syntax at the beginning of each source file. + + + Copyright (c) [Year] [name of copyright holder] + [Software Name] is licensed under Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL22 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. diff --git a/README.md b/README.md index 28315e698dd90ff6c55611f0d4119768433ed4d7..bcc03687695adf2b28ea05ddabb856c3b0401be9 100644 --- a/README.md +++ b/README.md @@ -13,4 +13,4 @@ iSulad follows the kernel coding conventions. You can find a detailed introducti ## Licensing -clibcni is licensed under the Mulan PSL v1. +clibcni is licensed under the Mulan PSL v2. diff --git a/clibcni.spec b/clibcni.spec index 32960086b5f866d6fa94684dadb172b8a854c422..3eb5d5b9494794bc333358735eb99099903c902e 100644 --- a/clibcni.spec +++ b/clibcni.spec @@ -5,7 +5,7 @@ Version: %{_version} Release: %{_release} Summary: CNI - the Container Network Interface Group: System Environment/Libraries -License: Mulan PSL v1 +License: Mulan PSL v2 URL: clibcni Source0: %{name}-2.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version} diff --git a/src/api.c b/src/api.c index 58149a6a739744a9bd3da1dfd2053f213a07ac95..efc7dd00402b4262ecdcd46a314604351da965bb 100644 --- a/src/api.c +++ b/src/api.c @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. - * clibcni licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * clibcni licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: tanyifeng * Create: 2019-04-25 * Description: provide cni api functions diff --git a/src/api.h b/src/api.h index 95b3cb8e2713c13d5d0356ab3ecad8815dc1b886..7b862c72089ab241fb5be92237acc490eea8cf8e 100644 --- a/src/api.h +++ b/src/api.h @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. - * clibcni licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * clibcni licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: tanyifeng * Create: 2019-04-25 * Description: provide cni function definition diff --git a/src/conf.c b/src/conf.c index a53d96b5100462089b9574db0e853c4b08324950..a4fec2c966f0b386e0d43ec882dfa99286862cec 100644 --- a/src/conf.c +++ b/src/conf.c @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. - * clibcni licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * clibcni licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: tanyifeng * Create: 2019-04-25 * Description: provide conf functions diff --git a/src/conf.h b/src/conf.h index ab4d3efb680baa984df3fa2fb960fa593d45e73b..6a80e1ecb34194aa34c33c39c9c3ac3e6bff2f06 100644 --- a/src/conf.h +++ b/src/conf.h @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. - * clibcni licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * clibcni licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: tanyifeng * Create: 2019-04-25 * Description: provide conf function definition diff --git a/src/invoke/args.c b/src/invoke/args.c index e55896ab1d2e0b21ce34472977c04023c27c2b46..f5ee13799b8295dc3b6295c851bbc7152565bd82 100644 --- a/src/invoke/args.c +++ b/src/invoke/args.c @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. - * clibcni licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * clibcni licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: tanyifeng * Create: 2019-04-25 * Description: provide args functions diff --git a/src/invoke/args.h b/src/invoke/args.h index 0b8c2736199a0a7893721bd5be4d2c9b3e522504..cc9873563317a3e1d57d3e7b6037f9210defec16 100644 --- a/src/invoke/args.h +++ b/src/invoke/args.h @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. - * clibcni licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * clibcni licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: tanyifeng * Create: 2019-04-25 * Description: provide cni args function definition diff --git a/src/invoke/exec.c b/src/invoke/exec.c index 3e04d15bcd5853f85c1e9a3c4812476f31fdd1ac..0d5aadbfea8c7577935b91aa50b75617eac6783b 100644 --- a/src/invoke/exec.c +++ b/src/invoke/exec.c @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. - * clibcni licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * clibcni licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: tanyifeng * Create: 2019-04-25 * Description: provide exec functions diff --git a/src/invoke/exec.h b/src/invoke/exec.h index 740897702c2702ae31e3e129374548f13ce16faa..0d4d26e1c531f1513f7a5f81ec1bbe85772bd0cc 100644 --- a/src/invoke/exec.h +++ b/src/invoke/exec.h @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. - * clibcni licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * clibcni licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: tanyifeng * Create: 2019-04-25 * Description: provide exec function definition diff --git a/src/invoke/invoke_errno.h b/src/invoke/invoke_errno.h index b01b082df5ae70ad629c6c5fde8b929819a9b39e..9049fd15f44f6ea3a1c04992adb3ecfb7962c785 100644 --- a/src/invoke/invoke_errno.h +++ b/src/invoke/invoke_errno.h @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. - * clibcni licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * clibcni licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: tanyifeng * Create: 2019-04-25 * Description: provide errno definition diff --git a/src/invoke/tools.c b/src/invoke/tools.c index 6cdeddb8bd77df848378c3619314809302c48bec..88763d207459418d4b2ba50b3d83d96990e59e34 100644 --- a/src/invoke/tools.c +++ b/src/invoke/tools.c @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. - * clibcni licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * clibcni licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: tanyifeng * Create: 2019-04-25 * Description: provide tools functions diff --git a/src/invoke/tools.h b/src/invoke/tools.h index d3ec1434e329b94898f123acee1245894ff24b3f..c405586b0ffc7bd8828d4ab32442351601a14331 100644 --- a/src/invoke/tools.h +++ b/src/invoke/tools.h @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. - * clibcni licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * clibcni licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: tanyifeng * Create: 2019-04-25 * Description: provide some tool function definition diff --git a/src/log.c b/src/log.c index 262235a36e5bfc583ce1708bc7107990daef0727..ac991d951e11308ddab0ddd612259ce35c632241 100644 --- a/src/log.c +++ b/src/log.c @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. - * clibcni licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * clibcni licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: wujing * Create: 2019-4-08 * Description: provide container log functions diff --git a/src/log.h b/src/log.h index 2fe54c057a4bc8b6d1e17552f51d7135ca20c01f..83fc070a18447123dbd6363d7c7883683d19b5dc 100644 --- a/src/log.h +++ b/src/log.h @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. - * clibcni licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * clibcni licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: wujing * Create: 2019-4-08 * Description: provide container log functions diff --git a/src/types/current.c b/src/types/current.c index 673aefd7d5e94acf3765d85edbc9c7bb14ffa7dc..d2944e352292e6227687bdb4c5865a00cc5dc117 100644 --- a/src/types/current.c +++ b/src/types/current.c @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. - * clibcni licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * clibcni licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: tanyifeng * Create: 2019-04-25 * Description: provide result functions diff --git a/src/types/current.h b/src/types/current.h index c5ecfe0a4eefceff3eaa4c97545ed35009b488b8..4035d7ee30c8143b07c68e96872b25de9daf6dd1 100644 --- a/src/types/current.h +++ b/src/types/current.h @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. - * clibcni licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * clibcni licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: tanyifeng * Create: 2019-04-25 * Description: provide result function definition diff --git a/src/types/types.c b/src/types/types.c index 55d0a0bcaa83c08d0a3cfe280a8e132171b6dd7d..422d473f10d9b2e5ea60b4a18daf290fed4528b7 100644 --- a/src/types/types.c +++ b/src/types/types.c @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. - * clibcni licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * clibcni licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: tanyifeng * Create: 2019-04-25 * Description: provide types functions diff --git a/src/types/types.h b/src/types/types.h index 2d933311b2a3c13fdfed280c7cfd251c4906a1f0..68d074aa657982b0c518bdf183db1553821653e9 100644 --- a/src/types/types.h +++ b/src/types/types.h @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. - * clibcni licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * clibcni licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: tanyifeng * Create: 2019-04-25 * Description: provide types function definition diff --git a/src/utils.c b/src/utils.c index 888405c543e47633fa8644ee91b4c8ec6389929d..403029f41ac638f76b4d53bebf20769bcf78d853 100644 --- a/src/utils.c +++ b/src/utils.c @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. - * clibcni licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * clibcni licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: tanyifeng * Create: 2019-04-25 * Description: provide util functions diff --git a/src/utils.h b/src/utils.h index a557d10649737ed80dfbb74950bce9687c1ed1c0..126136219823b38aea1dc378e3f356b31dedd5d1 100644 --- a/src/utils.h +++ b/src/utils.h @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. - * clibcni licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * clibcni licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: tanyifeng * Create: 2019-04-25 * Description: provide util function definition diff --git a/src/version/version.c b/src/version/version.c index 10b9ad509d2883d4a50f332780de2a090ed45c21..90ee862dce026d70b88546827de6b9bfa70fc23d 100644 --- a/src/version/version.c +++ b/src/version/version.c @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. - * clibcni licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * clibcni licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: tanyifeng * Create: 2019-04-25 * Description: provide version functions diff --git a/src/version/version.h b/src/version/version.h index 2c392a40e43c90d30f802af2c55f99547a3912d3..1f8200deb3b6e4850c6398ad64778d3313913fc8 100644 --- a/src/version/version.h +++ b/src/version/version.h @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. - * clibcni licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * clibcni licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: tanyifeng * Create: 2019-04-25 * Description: provide version function definition diff --git a/tools/static_check b/tools/static_check index 9c32f93cd8770dc91b5b7f809af5cad630d4cf1f..a7a45b7a4a3987b6c73b6580e87651a30f0d9fc9 100755 --- a/tools/static_check +++ b/tools/static_check @@ -1,13 +1,13 @@ ####################################################################### ##- @Copyright (C) Huawei Technologies Co., Ltd. 2019. All rights reserved. -# - clibcni licensed under the Mulan PSL v1. -# - You can use this software according to the terms and conditions of the Mulan PSL v1. -# - You may obtain a copy of Mulan PSL v1 at: -# - http://license.coscl.org.cn/MulanPSL +# - clibcni licensed under the Mulan PSL v2. +# - You can use this software according to the terms and conditions of the Mulan PSL v2. +# - You may obtain a copy of Mulan PSL v2 at: +# - http://license.coscl.org.cn/MulanPSL2 # - THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR # - IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR # - PURPOSE. -# - See the Mulan PSL v1 for more details. +# - See the Mulan PSL v2 for more details. ##- @Description: generate cetification ##- @Author: wujing ##- @Create: 2019-04-25 diff --git a/update-version.bash b/update-version.bash index a71157aeb7a60e732901076995b9367865ad9590..df25f52e036da9c2b98ab9ac35c3fd0f3d6717be 100755 --- a/update-version.bash +++ b/update-version.bash @@ -1,13 +1,13 @@ ####################################################################### ##- @Copyright (C) Huawei Technologies Co., Ltd. 2019. All rights reserved. -# - clibcni licensed under the Mulan PSL v1. -# - You can use this software according to the terms and conditions of the Mulan PSL v1. -# - You may obtain a copy of Mulan PSL v1 at: -# - http://license.coscl.org.cn/MulanPSL +# - clibcni licensed under the Mulan PSL v2. +# - You can use this software according to the terms and conditions of the Mulan PSL v2. +# - You may obtain a copy of Mulan PSL v2 at: +# - http://license.coscl.org.cn/MulanPSL2 # - THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR # - IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR # - PURPOSE. -# - See the Mulan PSL v1 for more details. +# - See the Mulan PSL v2 for more details. ##- @Description: generate cetification ##- @Author: wujing ##- @Create: 2019-04-25