4 files changed, 59 insertions, 11 deletions

diff --git a/src/common/command_line.h b/src/common/command_line.h
index 7b183d86b..f67efcf86 100644
--- a/src/common/command_line.h
+++ b/src/common/command_line.h
@@ -30,7 +30,9 @@
 
 #pragma once
 
+#include <functional>
 #include <iostream>
+#include <sstream>
 #include <type_traits>
 
 #include <boost/program_options/parsers.hpp>
@@ -46,7 +48,7 @@ namespace command_line
   //! \return True if `str` is `is_iequal("n" || "no" || `tr("no"))`.
   bool is_no(const std::string& str);
 
-  template<typename T, bool required = false>
+  template<typename T, bool required = false, bool dependent = false>
   struct arg_descriptor;
 
   template<typename T>
@@ -81,6 +83,22 @@ namespace command_line
   };
 
   template<typename T>
+  struct arg_descriptor<T, false, true>
+  {
+    typedef T value_type;
+
+    const char* name;
+    const char* description;
+
+    T default_value;
+
+    const arg_descriptor<bool, false>& ref;
+    std::function<T(bool, bool, T)> depf;
+
+    bool not_use_default;
+  };
+
+  template<typename T>
   boost::program_options::typed_value<T, char>* make_semantic(const arg_descriptor<T, true>& /*arg*/)
   {
     return boost::program_options::value<T>()->required();
@@ -96,6 +114,20 @@ namespace command_line
   }
 
   template<typename T>
+  boost::program_options::typed_value<T, char>* make_semantic(const arg_descriptor<T, false, true>& arg)
+  {
+    auto semantic = boost::program_options::value<T>();
+    if (!arg.not_use_default) {
+      std::ostringstream format;
+      format << arg.depf(false, true, arg.default_value) << ", "
+             << arg.depf(true, true, arg.default_value) << " if '"
+             << arg.ref.name << "'";
+      semantic->default_value(arg.depf(arg.ref.default_value, true, arg.default_value), format.str());
+    }
+    return semantic;
+  }
+
+  template<typename T>
   boost::program_options::typed_value<T, char>* make_semantic(const arg_descriptor<T, false>& arg, const T& def)
   {
     auto semantic = boost::program_options::value<T>();
@@ -112,8 +144,8 @@ namespace command_line
     return semantic;
   }
 
-  template<typename T, bool required>
-  void add_arg(boost::program_options::options_description& description, const arg_descriptor<T, required>& arg, bool unique = true)
+  template<typename T, bool required, bool dependent>
+  void add_arg(boost::program_options::options_description& description, const arg_descriptor<T, required, dependent>& arg, bool unique = true)
   {
     if (0 != description.find_nothrow(arg.name, false))
     {
@@ -189,12 +221,17 @@ namespace command_line
     return !value.empty();
   }
 
-  template<typename T, bool required>
-  bool is_arg_defaulted(const boost::program_options::variables_map& vm, const arg_descriptor<T, required>& arg)
+  template<typename T, bool required, bool dependent>
+  bool is_arg_defaulted(const boost::program_options::variables_map& vm, const arg_descriptor<T, required, dependent>& arg)
   {
     return vm[arg.name].defaulted();
   }
 
+  template<typename T, bool required>
+  T get_arg(const boost::program_options::variables_map& vm, const arg_descriptor<T, required, true>& arg)
+  {
+    return arg.depf(get_arg(vm, arg.ref), is_arg_defaulted(vm, arg), vm[arg.name].template as<T>());
+  }
 
   template<typename T, bool required>
   T get_arg(const boost::program_options::variables_map& vm, const arg_descriptor<T, required>& arg)
diff --git a/src/common/password.cpp b/src/common/password.cpp
index ef026c979..9336a14fc 100644
--- a/src/common/password.cpp
+++ b/src/common/password.cpp
@@ -42,12 +42,10 @@
 #include <unistd.h>
 #endif
 
-#ifdef HAVE_READLINE
-  #include "readline_buffer.h"
-#endif
-
 #include "memwipe.h"
 
+#define EOT 0x4
+
 namespace
 {
 #if defined(_WIN32)
@@ -134,7 +132,7 @@ namespace
     while (aPass.size() < tools::password_container::max_password_size)
     {
       int ch = getch();
-      if (EOF == ch)
+      if (EOF == ch || ch == EOT)
       {
         return false;
       }
@@ -229,13 +227,20 @@ namespace tools
     m_password.clear();
   }
 
+  std::atomic<bool> password_container::is_prompting(false);
+
   boost::optional<password_container> password_container::prompt(const bool verify, const char *message)
   {
+    is_prompting = true;
     password_container pass1{};
     password_container pass2{};
     if (is_cin_tty() ? read_from_tty(verify, message, pass1.m_password, pass2.m_password) : read_from_file(pass1.m_password))
+    {
+      is_prompting = false;
       return {std::move(pass1)};
+    }
 
+    is_prompting = false;
     return boost::none;
   }
 
diff --git a/src/common/password.h b/src/common/password.h
index 7c29effe4..61937b93a 100644
--- a/src/common/password.h
+++ b/src/common/password.h
@@ -31,6 +31,7 @@
 #pragma once
 
 #include <string>
+#include <atomic>
 #include <boost/optional/optional.hpp>
 #include "wipeable_string.h"
 
@@ -49,6 +50,7 @@ namespace tools
 
     //! \return A password from stdin TTY prompt or `std::cin` pipe.
     static boost::optional<password_container> prompt(bool verify, const char *mesage = "Password");
+    static std::atomic<bool> is_prompting;
 
     password_container(const password_container&) = delete;
     password_container(password_container&& rhs) = default;
diff --git a/src/common/util.h b/src/common/util.h
index 5afb42c97..d3ba47a4f 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -153,8 +153,12 @@ namespace tools
       }
       return r;
 #else
+      static struct sigaction sa;
+      memset(&sa, 0, sizeof(struct sigaction));
+      sa.sa_handler = posix_handler;
+      sa.sa_flags = 0;
       /* Only blocks SIGINT, SIGTERM and SIGPIPE */
-      signal(SIGINT, posix_handler);
+      sigaction(SIGINT, &sa, NULL);
       signal(SIGTERM, posix_handler);
       signal(SIGPIPE, SIG_IGN);
       m_handler = t;