!5 modify sys

Merge pull request !5 from xliu/util

LICENSE

@@ -0,0 +1,177 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

README.en.md

@@ -58,6 +58,10 @@ The process. Exit () method will cause the node. JS process to exit immediately.
 
 The process. Cwd () method returns the current working directory of the node. JS process.
 
+15.off(type:string) :boolean;
+
+The process. off () Clear user-stored function events.
+
 #### process usage method
 import { Process } from '@ohos.process' export default { data: { title: "" },
 
@@ -129,6 +133,12 @@ on(){
     proc.on("add",add);
 },
 
+off(){
+    var pro = new Process();
+    var result =  pro.off("add");
+    console.log("---------"+result);
+},
+
 Cwd(){
     var pro = new Process();
     var result = pro.cwd();

README.md

@@ -58,6 +58,10 @@
 
 该process.cwd()方法返回 Node.js 进程的当前工作目录。
 
+15.off(type: string): boolean;
+
+该process.off()方法会清除用户存储的事件。
+
 process 使用方法
 import { Process } from '@ohos.process' export default { data: { title: "" },
 
@@ -129,6 +133,12 @@ on(){
     proc.on("add",add);
 },
 
+off(){
+    var pro = new Process();
+    var result = pro.off("add");
+    console.log("--------"+result);
+},
+
 Cwd(){
     var pro = new Process();
     var result = pro.cwd();

process/js_childprocess.cpp

@@ -17,14 +17,16 @@
 
 #include <map>
 #include <vector>
+
 #include <csignal>
 #include <cstdlib>
 #include <sys/stat.h>
-#include <sys/wait.h>
 #include <unistd.h>
+#include <sys/wait.h>
 
 #include "securec.h"
 #include "utils/log.h"
+
 namespace OHOS::Js_sys_module::Process {
     std::map<std::string, int> g_signalsMap = {
         {"SIGHUP", 1},
@@ -204,7 +206,7 @@ namespace OHOS::Js_sys_module::Process {
         auto stdOutInfo = reinterpret_cast<StdInfo*>(data);
         char childStdout[MAXSIZE] = {0};
         while (*(stdOutInfo->isNeedRun)) {
-            read(stdOutInfo->fd, childStdout, sizeof(childStdout));
+            read(stdOutInfo->fd, childStdout, sizeof(childStdout) - 1);
             if (strlen(childStdout) > 0) {
                 stdOutInfo->stdData += childStdout;
             }
@@ -249,7 +251,7 @@ namespace OHOS::Js_sys_module::Process {
         auto stdErrInfo = reinterpret_cast<StdInfo*>(data);
         char childStderr[MAXSIZE] = {0};
         while (*(stdErrInfo->isNeedRun)) {
-            read(stdErrInfo->fd, childStderr, sizeof(childStderr));
+            read(stdErrInfo->fd, childStderr, sizeof(childStderr) - 1);
             if (strlen(childStderr) > 0) {
                 stdErrInfo->stdData += childStderr;
             }

process/js_childprocess.h

@@ -18,7 +18,6 @@
 
 #include <string>
 #include <unistd.h>
-
 #include "napi/native_api.h"
 #include "napi/native_node_api.h"
 namespace OHOS::Js_sys_module::Process {

process/js_process.cpp

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "js_process.h" 
+#include "js_process.h"
 
 #include <ctime>
 #include <vector>
@@ -69,7 +69,7 @@ napi_value Process::GetEGid() const
 napi_value Process::GetGroups() const
 {
     napi_value result = nullptr;
-    int progroups = getgroups(0, nullptr); 
+    int progroups = getgroups(0, nullptr);
     if (progroups == -1) {
         napi_throw_error(env, "-1", "getgroups initialize failed");
     }
@@ -128,10 +128,12 @@ void Process::Chdir(napi_value args) const
         napi_throw_error(env, "-2", "prolen is error !");
     }
     napi_get_value_string_utf8(env, args, path, prolen + 1, &prolen);
-    int proerr = uv_chdir(path);
+    int proerr = 0;
     if (path != nullptr) {
+        proerr = uv_chdir(path);
         delete []path;
     }
+
     if (proerr) {
         napi_throw_error(env, "-1", "chdir");
     }
@@ -211,9 +213,36 @@ void Process::On(napi_value str, napi_value function)
         buffer = new char[bufferSize + 1];
     }
     napi_get_value_string_utf8(env, str, buffer, bufferSize + 1, &bufferSize);
-    map_event_[buffer] = function;
     if (buffer != nullptr) {
+        map_event_[buffer] = function;
         delete []buffer;
     }
 }
+napi_value Process::Off(napi_value str)
+{
+    char *buffer = nullptr;
+    size_t bufferSize = 0;
+    bool flag = true;
+    napi_value result = nullptr;
+    napi_get_value_string_utf8(env, str, buffer, 0, &bufferSize);
+    if (bufferSize > 0) {
+        buffer = new char[bufferSize + 1];
+    }
+    napi_get_value_string_utf8(env, str, buffer, bufferSize + 1, &bufferSize);
+    std::string temp = buffer;
+    if (buffer != nullptr) {
+        delete[] buffer;
+    }
+    for (auto iter = map_event_.cbegin(); iter != map_event_.cend(); ++iter) {
+        if (iter->first == temp) {
+            map_event_.erase(temp);
+            NAPI_CALL(env, napi_get_boolean(env, flag, &result));
+            return result;
+        }
+    }
+    flag = false;
+    NAPI_CALL(env, napi_get_boolean(env, flag, &result));
+    return result;
+
 }
+}

process/js_process.h

@@ -25,7 +25,7 @@ namespace OHOS::Js_sys_module::Process {
 class Process {
 public:
     explicit Process(napi_env env);
-    virtual~Process(){} 
+    virtual~Process() {}
     napi_value GetUid() const;
     napi_value GetGid() const;
     napi_value GetEUid() const;
@@ -36,13 +36,14 @@ public:
     void Chdir(napi_value args) const;
     napi_value Uptime() const;
     napi_value Kill(napi_value proid, napi_value signal);
-    void Abort()const;
+    void Abort() const;
     void On(napi_value str, napi_value function);
-    void Exit(napi_value number)const;
-    napi_value Cwd()const;      
+    napi_value Off(napi_value str);
+    void Exit(napi_value number) const;
+    napi_value Cwd() const;      
 private:
     napi_env env;
-    std::map<std::string, napi_value> map_event_;       
+    std::map<std::string, napi_value> map_event_;
 };
 }
 #endif

process/native_module_process.cpp

@@ -110,7 +110,7 @@ namespace OHOS::Js_sys_module::Process {
 
         ChildProcess* object = nullptr;
         NAPI_CALL(env, napi_unwrap(env, thisVar, reinterpret_cast<void**>(&object)));
-        napi_value result = object->Wait(); 
+        napi_value result = object->Wait();
 
         return result;
     }
@@ -423,6 +423,19 @@ namespace OHOS::Js_sys_module::Process {
         return res;
     }
 
+    napi_value Off(napi_value str);
+    static napi_value Off(napi_env env, napi_callback_info info)
+    {
+        napi_value thisVar = nullptr;
+        size_t argc = 1;
+        napi_value args = nullptr;
+        napi_get_cb_info(env, info, &argc, &args, &thisVar, nullptr);
+        Process* object = nullptr;
+        NAPI_CALL(env, napi_unwrap(env, thisVar, (void**)&object));
+        napi_value result = object->Off(args);
+        return result;
+    }
+
     static napi_value Uptime(napi_env env, napi_callback_info info)
     {
         napi_value thisVar = nullptr;
@@ -464,6 +477,7 @@ namespace OHOS::Js_sys_module::Process {
             DECLARE_NAPI_FUNCTION("abort", Abort),
             DECLARE_NAPI_FUNCTION("cwd", Cwd),
             DECLARE_NAPI_FUNCTION("on", On),
+            DECLARE_NAPI_FUNCTION("off", Off),
             DECLARE_NAPI_FUNCTION("exit", Exit),
         };
         NAPI_CALL(env, napi_define_class(env, processClassName, strlen(processClassName), ProcessConstructor,