Merge pull request #1506 from joto/password-prompt

Modernize the password prompt code

Author: lonvia

src/CMakeLists.txt

@@ -25,7 +25,6 @@ set(osm2pgsql_lib_SOURCES
   pgsql-helper.cpp
   progress-display.cpp
   reprojection.cpp
-  sprompt.cpp
   table.cpp
   taginfo.cpp
   tagtransform-c.cpp

src/options.cpp

@@ -12,7 +12,7 @@
 #include "logging.hpp"
 #include "options.hpp"
 #include "reprojection.hpp"
-#include "sprompt.hpp"
+#include "util.hpp"
 #include "version.hpp"
 
 #include <algorithm>
@@ -639,10 +639,7 @@ options_t::options_t(int argc, char *argv[]) : options_t()
     check_options();
 
     if (pass_prompt) {
-        char const *prompt = simple_prompt("Password:", 100, 0);
-        if (prompt != nullptr) {
-            database_options.password = prompt;
-        }
+        database_options.password = util::get_password();
     }
 }
 

src/sprompt.cpp

@@ -7,8 +7,19 @@
  * For a full list of authors see the git log.
  */
 
+#include "config.h"
+
 #include "util.hpp"
 
+#include <iostream>
+
+#ifdef _WIN32
+#include <windows.h>
+#elif defined(HAVE_TERMIOS_H)
+#include <termios.h>
+#include <unistd.h>
+#endif
+
 namespace util {
 
 void string_id_list_t::add(osmid_t id)
@@ -44,4 +55,33 @@ std::string human_readable_duration(std::chrono::milliseconds ms)
         std::chrono::duration_cast<std::chrono::seconds>(ms).count()));
 }
 
+std::string get_password()
+{
+#ifdef _WIN32
+    HANDLE const handle_stdin = GetStdHandle(STD_INPUT_HANDLE);
+    DWORD mode = 0;
+    GetConsoleMode(handle_stdin, &mode);
+    SetConsoleMode(handle_stdin, mode & (~ENABLE_ECHO_INPUT));
+#elif defined(HAVE_TERMIOS_H)
+    termios orig_flags;
+    tcgetattr(STDIN_FILENO, &orig_flags);
+    termios flags = orig_flags;
+    flags.c_lflag &= ~static_cast<unsigned int>(ECHO);
+    tcsetattr(STDIN_FILENO, TCSANOW, &flags);
+#endif
+
+    std::string password;
+    std::cout << "Password:";
+    std::getline(std::cin, password);
+    std::cout << "\n";
+
+#ifdef _WIN32
+    SetConsoleMode(handle_stdin, mode);
+#elif defined(HAVE_TERMIOS_H)
+    tcsetattr(STDIN_FILENO, TCSANOW, &orig_flags);
+#endif
+
+    return password;
+}
+
 } // namespace util

src/sprompt.hpp

@@ -126,6 +126,8 @@ std::string human_readable_duration(uint64_t seconds);
 
 std::string human_readable_duration(std::chrono::milliseconds ms);
 
+std::string get_password();
+
 } // namespace util
 
 #endif // OSM2PGSQL_UTIL_HPP