removed useless PSIGTERM check on windows

wgledbe · Jul 27, 2020 · a7ac34f · a7ac34f
1 parent f80e67e
commit a7ac34f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/cpp/subprocess/ProcessBuilder.cpp b/src/cpp/subprocess/ProcessBuilder.cpp
@@ -366,8 +366,6 @@ namespace subprocess {
         } else if (signum == PSIGINT) {
             // can I use pid for processgroupid?
             success = GenerateConsoleCtrlEvent(CTRL_C_EVENT, pid);
-        } else if (signum == PSIGTERM) {
-            success = GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT, pid);
         } else {
             success = GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT, pid);
         }

diff --git a/src/cpp/subprocess/environ.cpp b/src/cpp/subprocess/environ.cpp
@@ -14,6 +14,13 @@ namespace subprocess {
     EnvironSetter::EnvironSetter(const std::string& name) {
         mName = name;
     }
+    EnvironSetter::operator bool() const {
+        if (mName.empty())
+            return false;
+        const char* value = ::getenv(mName.c_str());
+        if (value == nullptr) return false;
+        return !!*value;
+    }
     std::string EnvironSetter::to_string() {
         const char *value = ::getenv(mName.c_str());
         return value? value : "" ;

diff --git a/src/cpp/subprocess/environ.hpp b/src/cpp/subprocess/environ.hpp
@@ -11,6 +11,7 @@ namespace subprocess {
     public:
         EnvironSetter(const std::string& name);
         operator std::string() { return to_string(); }
+        explicit operator bool() const;
         std::string to_string();
         EnvironSetter &operator=(const std::string &str);
         EnvironSetter &operator=(const char* str);